Changeset 94

Timestamp:

04/09/07 23:53:05 (3 years ago)

Author:

eevee

Message:

Made big improvements to location display, as well as a few other little adjustments.

Location:

veekun/branches/layout

Files:

• lib/Vee/Controller/Dex.pm (modified) (4 diffs)
• script/pokedex.sql (modified) (230 diffs)
• templates/dex/common.tt (modified) (2 diffs)
• templates/dex/page/pokemon.tt (modified) (8 diffs)
• templates/style/dex.tt (modified) (2 diffs)
• templates/style/global.tt (modified) (1 diff)
• templates/style/index.tt (modified) (1 diff)
• templates/wrapper.tt (modified) (1 diff)

veekun/branches/layout/lib/Vee/Controller/Dex.pm

@@ -8 +8 @@
 use String::Approx 'adist';
 use JSON;
-use List::Util qw/first min max/;
+use List::Util qw/first min max sum/;
+use List::MoreUtils qw/uniq/;
 
 =head1 NAME
@@ -401 +402 @@
     });
 
-    # locations!
-    $s->{encounters} = get_locations($row);
+    # this is all devoted to locations, the second-most complicated section!
+    # this is engineered to be as usable as possible, which means:
+    # 1. columns that are empty will not show up
+    # 2. replacements like day/night/swarm will show levels/rarity for when that
+    #    event is in effect, rather than a meaningless icon
+    my $encounters_rs = $row->encounters_rs(undef, {
+        prefetch  => 'location',
+        group_by  => [qw/ location_id section method /],
+
+        # this minor hackery will essentially collapse multiple rows for a
+        # method into one short one we care about
+        '+select' => [
+            \ 'GROUP_CONCAT(rarity SEPARATOR " ") AS rarity',
+            \ 'MIN(min_level) AS min_level',
+            \ 'MAX(max_level) AS max_level',
+        ],
+        '+as'     => [qw/ rarity min_level max_level /],
+
+        # grass needs to come first so we can do replacements correctly
+        order_by  => 'method = "grass" DESC',  
+    } );
+
+    my %locations;
+    my (%loc_seen_methods, $loc_any_sections, %loc_bases);
+    while (my $encounter = $encounters_rs->next) {
+        my $sec_ref = $locations{ $encounter->location->name }{ $encounter->section } ||= {};
+
+        my $is_replacement = grep { $encounter->method eq $_ } qw/ daytime night /;
+
+        # make levels intelligently readable
+        my ($min, $max) = ($encounter->min_level, $encounter->max_level);
+
+        my @rarities = split / /, $encounter->rarity;
+
+        # this assumes that the levels are already in the database, although
+        # it will quietly assume otherwise if they happen to be zero, in which
+        # case the levels will just potentially be off a bit.
+        # sql: UPDATE location_encounters l INNER JOIN location_encounters l2 USING (location_id, section, rarity) SET l.min_level = l2.min_level, l.max_level = l2.max_level WHERE l.method IN ('daytime', 'night') AND l2.method = 'grass';
+
+        if ($is_replacement and
+            my $base_ref = $loc_bases{ $encounter->location->name }{ $encounter->section })
+        {
+            @rarities = uniq @rarities, split / /, $base_ref->rarity;
+            warn $encounter->section; warn @rarities; warn $base_ref->rarity;
+            
+            $min = min $min, $base_ref->min_level;
+            $max = min $max, $base_ref->max_level;
+        }
+
+        my $level;
+        if (not $min) {
+            $level = '';
+        } elsif ($min == $max) {
+            $level = $min;
+        } else {
+            $level = $min . ' - ' . $max;
+        }
+
+        my $rarity = sum map { $Generations[3]{locpercents}[$_] } @rarities;
+
+        $sec_ref->{ $encounter->method } = {
+            level  => $level,
+            rarity => $rarity,
+        };
+        $loc_bases{ $encounter->location->name }{ $encounter->section } = $encounter
+            if $encounter->method eq 'grass';
+
+        $loc_seen_methods{ $encounter->method } = 1;
+        $loc_any_sections = 1 if $encounter->section;
+    }
+    $s->{encounters} = \%locations;
+
+    my @location_columns = grep { $loc_seen_methods{$_} } qw/
+        grass daytime night surfing
+        old-rod good-rod super-rod swarm poketore
+    /;
+    push @location_columns, 'dualslot'
+        if grep { $loc_seen_methods{$_} }
+        qw/ ds-ruby ds-sapphire ds-emerald ds-firered ds-leafgreen /;
+    unshift @location_columns, 'section' if $loc_any_sections;
+    $s->{location_columns} = { map { $_ => 1 } @location_columns };
 
     # moves from here down
@@ -898 +978 @@
         # this minor hackery will essentially collapse multiple rows for a method into one short one we care about
         '+select' => [
-            \ 'MIN(rarity) AS rarity',
+            \ 'GROUP_CONCAT(rarity SEPARATOR " ") AS rarity',
             \ 'MIN(min_level) AS min_level',
             \ 'MAX(max_level) AS max_level',
@@ -915 +995 @@
             $level = $encounter->min_level . ' - ' . $encounter->max_level;
         }
-        $locations{ $encounter->location->name }{ $encounter->section }{ $encounter->method } = { level => $level, rarity => $encounter->rarity };
+
+        $locations{ $encounter->location->name }{ $encounter->section }{ $encounter->method } = { level => $level, rarity => min $encounter->rarity };
     }
 

veekun/branches/layout/script/pokedex.sql

@@ -3440 +3440 @@
   section varchar(128) NOT NULL,
   pokemon_id int(10) unsigned NOT NULL,
-  method enum('grass','surfing','old-rod','good-rod','super-rod','swarm','morning','night','poketore','ds-ruby','ds-sapphire','ds-emerald','ds-firered','ds-leafgreen') NOT NULL,
+  method enum('grass','surfing','old-rod','good-rod','super-rod','swarm','daytime','night','poketore','ds-ruby','ds-sapphire','ds-emerald','ds-firered','ds-leafgreen') NOT NULL,
   min_level tinyint(3) unsigned NOT NULL default '0',
   max_level tinyint(3) unsigned NOT NULL default '0'
@@ -3465 +3465 @@
 (1,0,'diamond','1F',201,'swarm',0,0),
 (1,1,'diamond','1F',201,'swarm',0,0),
-(1,2,'diamond','1F',201,'morning',0,0),
-(1,3,'diamond','1F',201,'morning',0,0),
-(1,4,'diamond','1F',201,'night',0,0),
-(1,5,'diamond','1F',201,'night',0,0),
+(1,2,'diamond','1F',201,'daytime',18,18),
+(1,3,'diamond','1F',201,'daytime',21,21),
+(1,2,'diamond','1F',201,'night',18,18),
+(1,3,'diamond','1F',201,'night',21,21),
 (1,6,'diamond','1F',201,'poketore',0,0),
 (1,7,'diamond','1F',201,'poketore',0,0),
@@ -3497 +3497 @@
 (1,0,'diamond','2F',201,'swarm',0,0),
 (1,1,'diamond','2F',201,'swarm',0,0),
-(1,2,'diamond','2F',201,'morning',0,0),
-(1,3,'diamond','2F',201,'morning',0,0),
-(1,4,'diamond','2F',201,'night',0,0),
-(1,5,'diamond','2F',201,'night',0,0),
+(1,2,'diamond','2F',201,'daytime',18,18),
+(1,3,'diamond','2F',201,'daytime',21,21),
+(1,2,'diamond','2F',201,'night',18,18),
+(1,3,'diamond','2F',201,'night',21,21),
 (1,6,'diamond','2F',201,'poketore',0,0),
 (1,7,'diamond','2F',201,'poketore',0,0),
@@ -3529 +3529 @@
 (1,0,'diamond','B1F a',201,'swarm',0,0),
 (1,1,'diamond','B1F a',201,'swarm',0,0),
-(1,2,'diamond','B1F a',201,'morning',0,0),
-(1,3,'diamond','B1F a',201,'morning',0,0),
-(1,4,'diamond','B1F a',201,'night',0,0),
-(1,5,'diamond','B1F a',201,'night',0,0),
+(1,2,'diamond','B1F a',201,'daytime',18,18),
+(1,3,'diamond','B1F a',201,'daytime',21,21),
+(1,2,'diamond','B1F a',201,'night',18,18),
+(1,3,'diamond','B1F a',201,'night',21,21),
 (1,6,'diamond','B1F a',201,'poketore',0,0),
 (1,7,'diamond','B1F a',201,'poketore',0,0),
@@ -3561 +3561 @@
 (1,0,'diamond','B1F b',201,'swarm',0,0),
 (1,1,'diamond','B1F b',201,'swarm',0,0),
-(1,2,'diamond','B1F b',201,'morning',0,0),
-(1,3,'diamond','B1F b',201,'morning',0,0),
-(1,4,'diamond','B1F b',201,'night',0,0),
-(1,5,'diamond','B1F b',201,'night',0,0),
+(1,2,'diamond','B1F b',201,'daytime',18,18),
+(1,3,'diamond','B1F b',201,'daytime',21,21),
+(1,2,'diamond','B1F b',201,'night',18,18),
+(1,3,'diamond','B1F b',201,'night',21,21),
 (1,6,'diamond','B1F b',201,'poketore',0,0),
 (1,7,'diamond','B1F b',201,'poketore',0,0),
@@ -3593 +3593 @@
 (1,0,'diamond','B1F c',201,'swarm',0,0),
 (1,1,'diamond','B1F c',201,'swarm',0,0),
-(1,2,'diamond','B1F c',201,'morning',0,0),
-(1,3,'diamond','B1F c',201,'morning',0,0),
-(1,4,'diamond','B1F c',201,'night',0,0),
-(1,5,'diamond','B1F c',201,'night',0,0),
+(1,2,'diamond','B1F c',201,'daytime',18,18),
+(1,3,'diamond','B1F c',201,'daytime',21,21),
+(1,2,'diamond','B1F c',201,'night',18,18),
+(1,3,'diamond','B1F c',201,'night',21,21),
 (1,6,'diamond','B1F c',201,'poketore',0,0),
 (1,7,'diamond','B1F c',201,'poketore',0,0),
@@ -3625 +3625 @@
 (1,0,'diamond','B2F a',201,'swarm',0,0),
 (1,1,'diamond','B2F a',201,'swarm',0,0),
-(1,2,'diamond','B2F a',201,'morning',0,0),
-(1,3,'diamond','B2F a',201,'morning',0,0),
-(1,4,'diamond','B2F a',201,'night',0,0),
-(1,5,'diamond','B2F a',201,'night',0,0),
+(1,2,'diamond','B2F a',201,'daytime',18,18),
+(1,3,'diamond','B2F a',201,'daytime',21,21),
+(1,2,'diamond','B2F a',201,'night',18,18),
+(1,3,'diamond','B2F a',201,'night',21,21),
 (1,6,'diamond','B2F a',201,'poketore',0,0),
 (1,7,'diamond','B2F a',201,'poketore',0,0),
@@ -3657 +3657 @@
 (1,0,'diamond','B2F b',201,'swarm',0,0),
 (1,1,'diamond','B2F b',201,'swarm',0,0),
-(1,2,'diamond','B2F b',201,'morning',0,0),
-(1,3,'diamond','B2F b',201,'morning',0,0),
-(1,4,'diamond','B2F b',201,'night',0,0),
-(1,5,'diamond','B2F b',201,'night',0,0),
+(1,2,'diamond','B2F b',201,'daytime',18,18),
+(1,3,'diamond','B2F b',201,'daytime',21,21),
+(1,2,'diamond','B2F b',201,'night',18,18),
+(1,3,'diamond','B2F b',201,'night',21,21),
 (1,6,'diamond','B2F b',201,'poketore',0,0),
 (1,7,'diamond','B2F b',201,'poketore',0,0),
@@ -3689 +3689 @@
 (1,0,'diamond','B2F c',201,'swarm',0,0),
 (1,1,'diamond','B2F c',201,'swarm',0,0),
-(1,2,'diamond','B2F c',201,'morning',0,0),
-(1,3,'diamond','B2F c',201,'morning',0,0),
-(1,4,'diamond','B2F c',201,'night',0,0),
-(1,5,'diamond','B2F c',201,'night',0,0),
+(1,2,'diamond','B2F c',201,'daytime',18,18),
+(1,3,'diamond','B2F c',201,'daytime',21,21),
+(1,2,'diamond','B2F c',201,'night',18,18),
+(1,3,'diamond','B2F c',201,'night',21,21),
 (1,6,'diamond','B2F c',201,'poketore',0,0),
 (1,7,'diamond','B2F c',201,'poketore',0,0),
@@ -3721 +3721 @@
 (1,0,'diamond','B3F a',201,'swarm',0,0),
 (1,1,'diamond','B3F a',201,'swarm',0,0),
-(1,2,'diamond','B3F a',201,'morning',0,0),
-(1,3,'diamond','B3F a',201,'morning',0,0),
-(1,4,'diamond','B3F a',201,'night',0,0),
-(1,5,'diamond','B3F a',201,'night',0,0),
+(1,2,'diamond','B3F a',201,'daytime',18,18),
+(1,3,'diamond','B3F a',201,'daytime',21,21),
+(1,2,'diamond','B3F a',201,'night',18,18),
+(1,3,'diamond','B3F a',201,'night',21,21),
 (1,6,'diamond','B3F a',201,'poketore',0,0),
 (1,7,'diamond','B3F a',201,'poketore',0,0),
@@ -3753 +3753 @@
 (1,0,'diamond','B3F b',201,'swarm',0,0),
 (1,1,'diamond','B3F b',201,'swarm',0,0),
-(1,2,'diamond','B3F b',201,'morning',0,0),
-(1,3,'diamond','B3F b',201,'morning',0,0),
-(1,4,'diamond','B3F b',201,'night',0,0),
-(1,5,'diamond','B3F b',201,'night',0,0),
+(1,2,'diamond','B3F b',201,'daytime',18,18),
+(1,3,'diamond','B3F b',201,'daytime',21,21),
+(1,2,'diamond','B3F b',201,'night',18,18),
+(1,3,'diamond','B3F b',201,'night',21,21),
 (1,6,'diamond','B3F b',201,'poketore',0,0),
 (1,7,'diamond','B3F b',201,'poketore',0,0),
@@ -3785 +3785 @@
 (1,0,'diamond','B3F c',201,'swarm',0,0),
 (1,1,'diamond','B3F c',201,'swarm',0,0),
-(1,2,'diamond','B3F c',201,'morning',0,0),
-(1,3,'diamond','B3F c',201,'morning',0,0),
-(1,4,'diamond','B3F c',201,'night',0,0),
-(1,5,'diamond','B3F c',201,'night',0,0),
+(1,2,'diamond','B3F c',201,'daytime',18,18),
+(1,3,'diamond','B3F c',201,'daytime',21,21),
+(1,2,'diamond','B3F c',201,'night',18,18),
+(1,3,'diamond','B3F c',201,'night',21,21),
 (1,6,'diamond','B3F c',201,'poketore',0,0),
 (1,7,'diamond','B3F c',201,'poketore',0,0),
@@ -3817 +3817 @@
 (1,0,'diamond','B3F d',201,'swarm',0,0),
 (1,1,'diamond','B3F d',201,'swarm',0,0),
-(1,2,'diamond','B3F d',201,'morning',0,0),
-(1,3,'diamond','B3F d',201,'morning',0,0),
-(1,4,'diamond','B3F d',201,'night',0,0),
-(1,5,'diamond','B3F d',201,'night',0,0),
+(1,2,'diamond','B3F d',201,'daytime',18,18),
+(1,3,'diamond','B3F d',201,'daytime',21,21),
+(1,2,'diamond','B3F d',201,'night',18,18),
+(1,3,'diamond','B3F d',201,'night',21,21),
 (1,6,'diamond','B3F d',201,'poketore',0,0),
 (1,7,'diamond','B3F d',201,'poketore',0,0),
@@ -3849 +3849 @@
 (1,0,'diamond','B3F e',201,'swarm',0,0),
 (1,1,'diamond','B3F e',201,'swarm',0,0),
-(1,2,'diamond','B3F e',201,'morning',0,0),
-(1,3,'diamond','B3F e',201,'morning',0,0),
-(1,4,'diamond','B3F e',201,'night',0,0),
-(1,5,'diamond','B3F e',201,'night',0,0),
+(1,2,'diamond','B3F e',201,'daytime',18,18),
+(1,3,'diamond','B3F e',201,'daytime',21,21),
+(1,2,'diamond','B3F e',201,'night',18,18),
+(1,3,'diamond','B3F e',201,'night',21,21),
 (1,6,'diamond','B3F e',201,'poketore',0,0),
 (1,7,'diamond','B3F e',201,'poketore',0,0),
@@ -3881 +3881 @@
 (1,0,'diamond','B4F a',201,'swarm',0,0),
 (1,1,'diamond','B4F a',201,'swarm',0,0),
-(1,2,'diamond','B4F a',201,'morning',0,0),
-(1,3,'diamond','B4F a',201,'morning',0,0),
-(1,4,'diamond','B4F a',201,'night',0,0),
-(1,5,'diamond','B4F a',201,'night',0,0),
+(1,2,'diamond','B4F a',201,'daytime',18,18),
+(1,3,'diamond','B4F a',201,'daytime',21,21),
+(1,2,'diamond','B4F a',201,'night',18,18),
+(1,3,'diamond','B4F a',201,'night',21,21),
 (1,6,'diamond','B4F a',201,'poketore',0,0),
 (1,7,'diamond','B4F a',201,'poketore',0,0),
@@ -3913 +3913 @@
 (1,0,'diamond','B4F b',201,'swarm',0,0),
 (1,1,'diamond','B4F b',201,'swarm',0,0),
-(1,2,'diamond','B4F b',201,'morning',0,0),
-(1,3,'diamond','B4F b',201,'morning',0,0),
-(1,4,'diamond','B4F b',201,'night',0,0),
-(1,5,'diamond','B4F b',201,'night',0,0),
+(1,2,'diamond','B4F b',201,'daytime',18,18),
+(1,3,'diamond','B4F b',201,'daytime',21,21),
+(1,2,'diamond','B4F b',201,'night',18,18),
+(1,3,'diamond','B4F b',201,'night',21,21),
 (1,6,'diamond','B4F b',201,'poketore',0,0),
 (1,7,'diamond','B4F b',201,'poketore',0,0),
@@ -3945 +3945 @@
 (1,0,'diamond','B4F c',201,'swarm',0,0),
 (1,1,'diamond','B4F c',201,'swarm',0,0),
-(1,2,'diamond','B4F c',201,'morning',0,0),
-(1,3,'diamond','B4F c',201,'morning',0,0),
-(1,4,'diamond','B4F c',201,'night',0,0),
-(1,5,'diamond','B4F c',201,'night',0,0),
+(1,2,'diamond','B4F c',201,'daytime',18,18),
+(1,3,'diamond','B4F c',201,'daytime',21,21),
+(1,2,'diamond','B4F c',201,'night',18,18),
+(1,3,'diamond','B4F c',201,'night',21,21),
 (1,6,'diamond','B4F c',201,'poketore',0,0),
 (1,7,'diamond','B4F c',201,'poketore',0,0),
@@ -3977 +3977 @@
 (1,0,'diamond','B4F d',201,'swarm',0,0),
 (1,1,'diamond','B4F d',201,'swarm',0,0),
-(1,2,'diamond','B4F d',201,'morning',0,0),
-(1,3,'diamond','B4F d',201,'morning',0,0),
-(1,4,'diamond','B4F d',201,'night',0,0),
-(1,5,'diamond','B4F d',201,'night',0,0),
+(1,2,'diamond','B4F d',201,'daytime',18,18),
+(1,3,'diamond','B4F d',201,'daytime',21,21),
+(1,2,'diamond','B4F d',201,'night',18,18),
+(1,3,'diamond','B4F d',201,'night',21,21),
 (1,6,'diamond','B4F d',201,'poketore',0,0),
 (1,7,'diamond','B4F d',201,'poketore',0,0),
@@ -4009 +4009 @@
 (1,0,'diamond','B5F',201,'swarm',0,0),
 (1,1,'diamond','B5F',201,'swarm',0,0),
-(1,2,'diamond','B5F',201,'morning',0,0),
-(1,3,'diamond','B5F',201,'morning',0,0),
-(1,4,'diamond','B5F',201,'night',0,0),
-(1,5,'diamond','B5F',201,'night',0,0),
+(1,2,'diamond','B5F',201,'daytime',18,18),
+(1,3,'diamond','B5F',201,'daytime',21,21),
+(1,2,'diamond','B5F',201,'night',18,18),
+(1,3,'diamond','B5F',201,'night',21,21),
 (1,6,'diamond','B5F',201,'poketore',0,0),
 (1,7,'diamond','B5F',201,'poketore',0,0),
@@ -4071 +4071 @@
 (4,8,'diamond','',14,'ds-leafgreen',0,0),
 (4,9,'diamond','',14,'ds-leafgreen',0,0),
-(4,4,'diamond','',198,'night',0,0),
-(4,5,'diamond','',198,'night',0,0),
+(4,2,'diamond','',198,'night',11,11),
+(4,3,'diamond','',198,'night',10,10),
 (4,4,'diamond','',204,'ds-emerald',0,0),
 (4,5,'diamond','',204,'ds-emerald',0,0),
 (4,0,'diamond','',265,'grass',10,10),
 (4,2,'diamond','',265,'grass',11,11),
-(4,2,'diamond','',265,'morning',0,0),
+(4,2,'diamond','',265,'daytime',11,11),
 (4,1,'diamond','',266,'grass',10,10),
 (4,10,'diamond','',267,'grass',12,12),
@@ -4093 +4093 @@
 (4,7,'diamond','',406,'grass',12,12),
 (4,8,'diamond','',406,'grass',12,12),
-(4,3,'diamond','',406,'morning',0,0),
+(4,3,'diamond','',406,'daytime',10,10),
 (4,2,'diamond','',406,'ds-sapphire',0,0),
 (4,4,'diamond','',427,'grass',10,10),
@@ -4101 +4101 @@
 (5,2,'diamond','',22,'grass',54,54),
 (5,4,'diamond','',22,'grass',55,55),
-(5,2,'diamond','',22,'morning',0,0),
-(5,5,'diamond','',42,'night',0,0),
+(5,2,'diamond','',22,'daytime',54,54),
+(5,3,'diamond','',42,'night',54,54),
 (5,3,'diamond','',75,'grass',54,54),
 (5,7,'diamond','',75,'grass',56,56),
-(5,3,'diamond','',75,'morning',0,0),
+(5,3,'diamond','',75,'daytime',54,54),
 (5,5,'diamond','',110,'grass',55,55),
 (5,9,'diamond','',111,'grass',22,22),
@@ -4130 +4130 @@
 (5,8,'diamond','',324,'poketore',0,0),
 (5,9,'diamond','',324,'poketore',0,0),
-(5,4,'diamond','',354,'night',0,0),
+(5,2,'diamond','',354,'night',54,54),
 (5,2,'diamond','entrance',42,'grass',54,54),
-(5,2,'diamond','entrance',42,'morning',0,0),
-(5,4,'diamond','entrance',42,'night',0,0),
+(5,2,'diamond','entrance',42,'daytime',54,54),
+(5,2,'diamond','entrance',42,'night',54,54),
 (5,3,'diamond','entrance',67,'grass',56,56),
-(5,3,'diamond','entrance',67,'morning',0,0),
-(5,5,'diamond','entrance',67,'night',0,0),
+(5,3,'diamond','entrance',67,'daytime',56,56),
+(5,3,'diamond','entrance',67,'night',56,56),
 (5,8,'diamond','entrance',74,'grass',25,25),
 (5,10,'diamond','entrance',74,'grass',27,27),
@@ -4164 +4164 @@
 (5,7,'diamond','entrance',323,'grass',56,56),
 (5,2,'diamond','inside',42,'grass',56,56),
-(5,2,'diamond','inside',42,'morning',0,0),
-(5,4,'diamond','inside',42,'night',0,0),
+(5,2,'diamond','inside',42,'daytime',56,56),
+(5,2,'diamond','inside',42,'night',56,56),
 (5,3,'diamond','inside',67,'grass',58,58),
-(5,3,'diamond','inside',67,'morning',0,0),
-(5,5,'diamond','inside',67,'night',0,0),
+(5,3,'diamond','inside',67,'daytime',58,58),
+(5,3,'diamond','inside',67,'night',58,58),
 (5,8,'diamond','inside',74,'grass',27,27),
 (5,10,'diamond','inside',74,'grass',29,29),
@@ -4220 +4220 @@
 (7,11,'diamond','1F',42,'grass',50,50),
 (7,0,'diamond','1F',42,'swarm',0,0),
-(7,3,'diamond','1F',42,'morning',0,0),
-(7,5,'diamond','1F',42,'night',0,0),
+(7,3,'diamond','1F',42,'daytime',52,52),
+(7,3,'diamond','1F',42,'night',52,52),
 (7,9,'diamond','1F',42,'poketore',0,0),
 (7,1,'diamond','1F',42,'ds-ruby',0,0),
@@ -4229 +4229 @@
 (7,9,'diamond','1F',42,'ds-leafgreen',0,0),
 (7,2,'diamond','1F',75,'grass',52,52),
-(7,2,'diamond','1F',75,'morning',0,0),
-(7,4,'diamond','1F',75,'night',0,0),
+(7,2,'diamond','1F',75,'daytime',52,52),
+(7,2,'diamond','1F',75,'night',52,52),
 (7,5,'diamond','1F',95,'grass',51,51),
 (7,8,'diamond','1F',95,'grass',52,52),
@@ -4252 +4252 @@
 (7,11,'diamond','B1F',42,'grass',52,52),
 (7,0,'diamond','B1F',42,'swarm',0,0),
-(7,3,'diamond','B1F',42,'morning',0,0),
-(7,5,'diamond','B1F',42,'night',0,0),
+(7,3,'diamond','B1F',42,'daytime',54,54),
+(7,3,'diamond','B1F',42,'night',54,54),
 (7,9,'diamond','B1F',42,'poketore',0,0),
 (7,1,'diamond','B1F',42,'ds-ruby',0,0),
@@ -4261 +4261 @@
 (7,9,'diamond','B1F',42,'ds-leafgreen',0,0),
 (7,2,'diamond','B1F',75,'grass',54,54),
-(7,2,'diamond','B1F',75,'morning',0,0),
-(7,4,'diamond','B1F',75,'night',0,0),
+(7,2,'diamond','B1F',75,'daytime',54,54),
+(7,2,'diamond','B1F',75,'night',54,54),
 (7,8,'diamond','B1F',95,'grass',53,53),
 (7,10,'diamond','B1F',95,'grass',52,52),
@@ -4284 +4284 @@
 (7,11,'diamond','B2F',42,'grass',52,52),
 (7,0,'diamond','B2F',42,'swarm',0,0),
-(7,3,'diamond','B2F',42,'morning',0,0),
-(7,5,'diamond','B2F',42,'night',0,0),
+(7,3,'diamond','B2F',42,'daytime',54,54),
+(7,3,'diamond','B2F',42,'night',54,54),
 (7,9,'diamond','B2F',42,'poketore',0,0),
 (7,1,'diamond','B2F',42,'ds-ruby',0,0),
@@ -4293 +4293 @@
 (7,9,'diamond','B2F',42,'ds-leafgreen',0,0),
 (7,2,'diamond','B2F',75,'grass',54,54),
-(7,2,'diamond','B2F',75,'morning',0,0),
-(7,4,'diamond','B2F',75,'night',0,0),
+(7,2,'diamond','B2F',75,'daytime',54,54),
+(7,2,'diamond','B2F',75,'night',54,54),
 (7,8,'diamond','B2F',95,'grass',53,53),
 (7,10,'diamond','B2F',95,'grass',52,52),
@@ -4316 +4316 @@
 (7,11,'diamond','B3F',42,'grass',52,52),
 (7,0,'diamond','B3F',42,'swarm',0,0),
-(7,3,'diamond','B3F',42,'morning',0,0),
-(7,5,'diamond','B3F',42,'night',0,0),
+(7,3,'diamond','B3F',42,'daytime',54,54),
+(7,3,'diamond','B3F',42,'night',54,54),
 (7,9,'diamond','B3F',42,'poketore',0,0),
 (7,1,'diamond','B3F',42,'ds-ruby',0,0),
@@ -4325 +4325 @@
 (7,9,'diamond','B3F',42,'ds-leafgreen',0,0),
 (7,2,'diamond','B3F',75,'grass',54,54),
-(7,2,'diamond','B3F',75,'morning',0,0),
-(7,4,'diamond','B3F',75,'night',0,0),
+(7,2,'diamond','B3F',75,'daytime',54,54),
+(7,2,'diamond','B3F',75,'night',54,54),
 (7,8,'diamond','B3F',95,'grass',53,53),
 (7,10,'diamond','B3F',95,'grass',52,52),
@@ -4348 +4348 @@
 (7,11,'diamond','B4F',42,'grass',54,54),
 (7,0,'diamond','B4F',42,'swarm',0,0),
-(7,3,'diamond','B4F',42,'morning',0,0),
-(7,5,'diamond','B4F',42,'night',0,0),
+(7,3,'diamond','B4F',42,'daytime',56,56),
+(7,3,'diamond','B4F',42,'night',56,56),
 (7,9,'diamond','B4F',42,'poketore',0,0),
 (7,1,'diamond','B4F',42,'ds-ruby',0,0),
@@ -4357 +4357 @@
 (7,9,'diamond','B4F',42,'ds-leafgreen',0,0),
 (7,2,'diamond','B4F',75,'grass',56,56),
-(7,2,'diamond','B4F',75,'morning',0,0),
-(7,4,'diamond','B4F',75,'night',0,0),
+(7,2,'diamond','B4F',75,'daytime',56,56),
+(7,2,'diamond','B4F',75,'night',56,56),
 (7,5,'diamond','B4F',208,'grass',55,55),
 (7,7,'diamond','B4F',208,'grass',56,56),
@@ -4380 +4380 @@
 (7,11,'diamond','B5F',42,'grass',54,54),
 (7,0,'diamond','B5F',42,'swarm',0,0),
-(7,3,'diamond','B5F',42,'morning',0,0),
-(7,5,'diamond','B5F',42,'night',0,0),
+(7,3,'diamond','B5F',42,'daytime',56,56),
+(7,3,'diamond','B5F',42,'night',56,56),
 (7,9,'diamond','B5F',42,'poketore',0,0),
 (7,1,'diamond','B5F',42,'ds-ruby',0,0),
@@ -4389 +4389 @@
 (7,9,'diamond','B5F',42,'ds-leafgreen',0,0),
 (7,2,'diamond','B5F',75,'grass',56,56),
-(7,2,'diamond','B5F',75,'morning',0,0),
-(7,4,'diamond','B5F',75,'night',0,0),
+(7,2,'diamond','B5F',75,'daytime',56,56),
+(7,2,'diamond','B5F',75,'night',56,56),
 (7,5,'diamond','B5F',208,'grass',55,55),
 (7,7,'diamond','B5F',208,'grass',56,56),
@@ -4409 +4409 @@
 (8,2,'diamond','1F',41,'grass',7,7),
 (8,3,'diamond','1F',41,'grass',7,7),
-(8,2,'diamond','1F',41,'morning',0,0),
-(8,3,'diamond','1F',41,'morning',0,0),
-(8,4,'diamond','1F',41,'night',0,0),
-(8,5,'diamond','1F',41,'night',0,0),
+(8,2,'diamond','1F',41,'daytime',7,7),
+(8,3,'diamond','1F',41,'daytime',7,7),
+(8,2,'diamond','1F',41,'night',7,7),
+(8,3,'diamond','1F',41,'night',7,7),
 (8,0,'diamond','1F',74,'grass',6,6),
 (8,1,'diamond','1F',74,'grass',6,6),
@@ -4441 +4441 @@
 (8,2,'diamond','B1F',41,'grass',8,8),
 (8,3,'diamond','B1F',41,'grass',8,8),
-(8,2,'diamond','B1F',41,'morning',0,0),
-(8,3,'diamond','B1F',41,'morning',0,0),
-(8,4,'diamond','B1F',41,'night',0,0),
-(8,5,'diamond','B1F',41,'night',0,0),
+(8,2,'diamond','B1F',41,'daytime',8,8),
+(8,3,'diamond','B1F',41,'daytime',8,8),
+(8,2,'diamond','B1F',41,'night',8,8),
+(8,3,'diamond','B1F',41,'night',8,8),
 (8,0,'diamond','B1F',74,'grass',7,7),
 (8,1,'diamond','B1F',74,'grass',7,7),
@@ -4473 +4473 @@
 (9,2,'diamond','1F',41,'grass',6,6),
 (9,3,'diamond','1F',41,'grass',6,6),
-(9,2,'diamond','1F',41,'morning',0,0),
-(9,3,'diamond','1F',41,'morning',0,0),
-(9,4,'diamond','1F',41,'night',0,0),
-(9,5,'diamond','1F',41,'night',0,0),
+(9,2,'diamond','1F',41,'daytime',6,6),
+(9,3,'diamond','1F',41,'daytime',6,6),
+(9,2,'diamond','1F',41,'night',6,6),
+(9,3,'diamond','1F',41,'night',6,6),
 (9,0,'diamond','1F',74,'grass',5,5),
 (9,1,'diamond','1F',74,'grass',5,5),
@@ -4532 +4532 @@
 (9,7,'diamond','B1F',54,'grass',10,10),
 (9,1,'diamond','B1F',54,'surfing',20,30),
-(9,2,'diamond','B1F',54,'morning',0,0),
-(9,4,'diamond','B1F',54,'night',0,0),
+(9,2,'diamond','B1F',54,'daytime',8,8),
+(9,2,'diamond','B1F',54,'night',8,8),
 (9,6,'diamond','B1F',54,'poketore',0,0),
 (9,3,'diamond','B1F',55,'surfing',20,40),
 (9,4,'diamond','B1F',55,'surfing',20,40),
 (9,3,'diamond','B1F',74,'grass',9,9),
-(9,3,'diamond','B1F',74,'morning',0,0),
-(9,5,'diamond','B1F',74,'night',0,0),
+(9,3,'diamond','B1F',74,'daytime',9,9),
+(9,3,'diamond','B1F',74,'night',9,9),
 (9,0,'diamond','B1F',129,'old-rod',4,6),
 (9,1,'diamond','B1F',129,'old-rod',3,7),
@@ -4563 +4563 @@
 (10,11,'diamond','1F',41,'grass',16,16),
 (10,1,'diamond','1F',41,'swarm',0,0),
-(10,3,'diamond','1F',41,'morning',0,0),
-(10,5,'diamond','1F',41,'night',0,0),
+(10,3,'diamond','1F',41,'daytime',15,15),
+(10,3,'diamond','1F',41,'night',15,15),
 (10,7,'diamond','1F',41,'poketore',0,0),
 (10,9,'diamond','1F',41,'poketore',0,0),
@@ -4574 +4574 @@
 (10,8,'diamond','1F',74,'grass',16,16),
 (10,10,'diamond','1F',74,'grass',16,16),
-(10,2,'diamond','1F',74,'morning',0,0),
-(10,4,'diamond','1F',74,'night',0,0),
+(10,2,'diamond','1F',74,'daytime',15,15),
+(10,2,'diamond','1F',74,'night',15,15),
 (10,8,'diamond','1F',74,'poketore',0,0),
 (10,0,'diamond','1F',74,'ds-ruby',0,0),
@@ -4594 +4594 @@
 (10,11,'diamond','B1F',41,'grass',17,17),
 (10,1,'diamond','B1F',41,'swarm',0,0),
-(10,3,'diamond','B1F',41,'morning',0,0),
-(10,5,'diamond','B1F',41,'night',0,0),
+(10,3,'diamond','B1F',41,'daytime',16,16),
+(10,3,'diamond','B1F',41,'night',16,16),
 (10,9,'diamond','B1F',41,'poketore',0,0),
 (10,1,'diamond','B1F',41,'ds-ruby',0,0),
@@ -4602 +4602 @@
 (10,7,'diamond','B1F',41,'ds-firered',0,0),
 (10,2,'diamond','B1F',74,'grass',16,16),
-(10,2,'diamond','B1F',74,'morning',0,0),
-(10,4,'diamond','B1F',74,'night',0,0),
+(10,2,'diamond','B1F',74,'daytime',16,16),
+(10,2,'diamond','B1F',74,'night',16,16),
 (10,0,'diamond','B1F',436,'grass',15,15),
 (10,4,'diamond','B1F',436,'grass',16,16),
@@ -4626 +4626 @@
 (11,11,'diamond','1F',41,'grass',18,18),
 (11,1,'diamond','1F',41,'swarm',0,0),
-(11,3,'diamond','1F',41,'morning',0,0),
+(11,3,'diamond','1F',41,'daytime',17,17),
 (11,7,'diamond','1F',41,'poketore',0,0),
 (11,9,'diamond','1F',41,'poketore',0,0),
@@ -4641 +4641 @@
 (11,10,'diamond','1F',92,'grass',18,18),
 (11,0,'diamond','1F',92,'swarm',0,0),
-(11,2,'diamond','1F',92,'morning',0,0),
+(11,2,'diamond','1F',92,'daytime',17,17),
 (11,6,'diamond','1F',92,'poketore',0,0),
 (11,8,'diamond','1F',92,'poketore',0,0),
@@ -4649 +4649 @@
 (11,6,'diamond','1F',92,'ds-firered',0,0),
 (11,8,'diamond','1F',92,'ds-leafgreen',0,0),
-(11,4,'diamond','1F',198,'night',0,0),
-(11,5,'diamond','1F',198,'night',0,0),
+(11,2,'diamond','1F',198,'night',17,17),
+(11,3,'diamond','1F',198,'night',17,17),
 (11,1,'diamond','2F',41,'grass',17,17),
 (11,3,'diamond','2F',41,'grass',18,18),
@@ -4658 +4658 @@
 (11,11,'diamond','2F',41,'grass',19,19),
 (11,1,'diamond','2F',41,'swarm',0,0),
-(11,3,'diamond','2F',41,'morning',0,0),
+(11,3,'diamond','2F',41,'daytime',18,18),
 (11,7,'diamond','2F',41,'poketore',0,0),
 (11,9,'diamond','2F',41,'poketore',0,0),
@@ -4673 +4673 @@
 (11,10,'diamond','2F',92,'grass',19,19),
 (11,0,'diamond','2F',92,'swarm',0,0),
-(11,2,'diamond','2F',92,'morning',0,0),
+(11,2,'diamond','2F',92,'daytime',18,18),
 (11,6,'diamond','2F',92,'poketore',0,0),
 (11,8,'diamond','2F',92,'poketore',0,0),
@@ -4681 +4681 @@
 (11,6,'diamond','2F',92,'ds-firered',0,0),
 (11,8,'diamond','2F',92,'ds-leafgreen',0,0),
-(11,4,'diamond','2F',198,'night',0,0),
-(11,5,'diamond','2F',198,'night',0,0),
+(11,2,'diamond','2F',198,'night',18,18),
+(11,3,'diamond','2F',198,'night',18,18),
 (11,1,'diamond','3F',41,'grass',18,18),
 (11,3,'diamond','3F',41,'grass',19,19),
@@ -4689 +4689 @@
 (11,9,'diamond','3F',41,'grass',20,20),
 (11,1,'diamond','3F',41,'swarm',0,0),
-(11,3,'diamond','3F',41,'morning',0,0),
+(11,3,'diamond','3F',41,'daytime',19,19),
 (11,7,'diamond','3F',41,'poketore',0,0),
 (11,1,'diamond','3F',41,'ds-ruby',0,0),
@@ -4705 +4705 @@
 (11,10,'diamond','3F',92,'grass',20,20),
 (11,0,'diamond','3F',92,'swarm',0,0),
-(11,2,'diamond','3F',92,'morning',0,0),
+(11,2,'diamond','3F',92,'daytime',19,19),
 (11,6,'diamond','3F',92,'poketore',0,0),
 (11,8,'diamond','3F',92,'poketore',0,0),
@@ -4713 +4713 @@
 (11,6,'diamond','3F',92,'ds-firered',0,0),
 (11,8,'diamond','3F',92,'ds-leafgreen',0,0),
-(11,4,'diamond','3F',198,'night',0,0),
-(11,5,'diamond','3F',198,'night',0,0),
+(11,2,'diamond','3F',198,'night',19,19),
+(11,3,'diamond','3F',198,'night',19,19),
 (11,1,'diamond','4F',41,'grass',19,19),
 (11,3,'diamond','4F',41,'grass',20,20),
@@ -4720 +4720 @@
 (11,7,'diamond','4F',41,'grass',21,21),
 (11,1,'diamond','4F',41,'swarm',0,0),
-(11,3,'diamond','4F',41,'morning',0,0),
+(11,3,'diamond','4F',41,'daytime',20,20),
 (11,7,'diamond','4F',41,'poketore',0,0),
 (11,9,'diamond','4F',42,'grass',20,20),
@@ -4737 +4737 @@
 (11,10,'diamond','4F',92,'grass',21,21),
 (11,0,'diamond','4F',92,'swarm',0,0),
-(11,2,'diamond','4F',92,'morning',0,0),
+(11,2,'diamond','4F',92,'daytime',20,20),
 (11,6,'diamond','4F',92,'poketore',0,0),
 (11,8,'diamond','4F',92,'poketore',0,0),
@@ -4745 +4745 @@
 (11,6,'diamond','4F',92,'ds-firered',0,0),
 (11,8,'diamond','4F',92,'ds-leafgreen',0,0),
-(11,4,'diamond','4F',198,'night',0,0),
-(11,5,'diamond','4F',198,'night',0,0),
+(11,2,'diamond','4F',198,'night',20,20),
+(11,3,'diamond','4F',198,'night',20,20),
 (11,1,'diamond','5F',41,'grass',20,20),
 (11,3,'diamond','5F',41,'grass',21,21),
 (11,5,'diamond','5F',41,'grass',21,21),
 (11,1,'diamond','5F',41,'swarm',0,0),
-(11,3,'diamond','5F',41,'morning',0,0),
+(11,3,'diamond','5F',41,'daytime',21,21),
 (11,7,'diamond','5F',41,'poketore',0,0),
 (11,7,'diamond','5F',42,'grass',21,21),
@@ -4769 +4769 @@
 (11,10,'diamond','5F',92,'grass',22,22),
 (11,0,'diamond','5F',92,'swarm',0,0),
-(11,2,'diamond','5F',92,'morning',0,0),
+(11,2,'diamond','5F',92,'daytime',21,21),
 (11,6,'diamond','5F',92,'poketore',0,0),
 (11,8,'diamond','5F',92,'poketore',0,0),
@@ -4777 +4777 @@
 (11,6,'diamond','5F',92,'ds-firered',0,0),
 (11,8,'diamond','5F',92,'ds-leafgreen',0,0),
-(11,4,'diamond','5F',198,'night',0,0),
-(11,5,'diamond','5F',198,'night',0,0),
+(11,2,'diamond','5F',198,'night',21,21),
+(11,3,'diamond','5F',198,'night',21,21),
 (12,0,'diamond','',54,'surfing',20,30),
 (12,1,'diamond','',54,'surfing',20,40),
@@ -4868 +4868 @@
 (15,8,'diamond','',418,'grass',9,9),
 (15,10,'diamond','',418,'grass',9,9),
-(15,2,'diamond','',418,'morning',0,0),
-(15,4,'diamond','',418,'night',0,0),
+(15,2,'diamond','',418,'daytime',8,8),
+(15,2,'diamond','',418,'night',8,8),
 (15,0,'diamond','',418,'ds-ruby',0,0),
 (15,2,'diamond','',418,'ds-sapphire',0,0),
@@ -4879 +4879 @@
 (15,9,'diamond','',422,'grass',9,9),
 (15,11,'diamond','',422,'grass',9,9),
-(15,3,'diamond','',422,'morning',0,0),
-(15,5,'diamond','',422,'night',0,0),
+(15,3,'diamond','',422,'daytime',8,8),
+(15,3,'diamond','',422,'night',8,8),
 (15,1,'diamond','',422,'ds-ruby',0,0),
 (15,3,'diamond','',422,'ds-sapphire',0,0),
@@ -4914 +4914 @@
 (17,3,'diamond','Mid-level (most rooms)',42,'grass',56,56),
 (17,0,'diamond','Mid-level (most rooms)',42,'swarm',0,0),
-(17,3,'diamond','Mid-level (most rooms)',42,'morning',0,0),
-(17,5,'diamond','Mid-level (most rooms)',42,'night',0,0),
+(17,3,'diamond','Mid-level (most rooms)',42,'daytime',56,56),
+(17,3,'diamond','Mid-level (most rooms)',42,'night',56,56),
 (17,2,'diamond','Mid-level (most rooms)',93,'grass',55,55),
 (17,4,'diamond','Mid-level (most rooms)',93,'grass',56,56),
 (17,6,'diamond','Mid-level (most rooms)',93,'grass',54,54),
 (17,7,'diamond','Mid-level (most rooms)',93,'grass',54,54),
-(17,2,'diamond','Mid-level (most rooms)',93,'morning',0,0),
-(17,4,'diamond','Mid-level (most rooms)',93,'night',0,0),
+(17,2,'diamond','Mid-level (most rooms)',93,'daytime',55,55),
+(17,2,'diamond','Mid-level (most rooms)',93,'night',55,55),
 (17,6,'diamond','Mid-level (most rooms)',93,'poketore',0,0),
 (17,2,'diamond','Mid-level (most rooms)',337,'ds-sapphire',0,0),
@@ -4946 +4946 @@
 (17,3,'diamond','Low-level (rooms 4-9)',42,'grass',46,46),
 (17,0,'diamond','Low-level (rooms 4-9)',42,'swarm',0,0),
-(17,3,'diamond','Low-level (rooms 4-9)',42,'morning',0,0),
-(17,5,'diamond','Low-level (rooms 4-9)',42,'night',0,0),
+(17,3,'diamond','Low-level (rooms 4-9)',42,'daytime',46,46),
+(17,3,'diamond','Low-level (rooms 4-9)',42,'night',46,46),
 (17,2,'diamond','Low-level (rooms 4-9)',93,'grass',45,45),
 (17,4,'diamond','Low-level (rooms 4-9)',93,'grass',46,46),
 (17,6,'diamond','Low-level (rooms 4-9)',93,'grass',44,44),
 (17,7,'diamond','Low-level (rooms 4-9)',93,'grass',44,44),
-(17,2,'diamond','Low-level (rooms 4-9)',93,'morning',0,0),
-(17,4,'diamond','Low-level (rooms 4-9)',93,'night',0,0),
+(17,2,'diamond','Low-level (rooms 4-9)',93,'daytime',45,45),
+(17,2,'diamond','Low-level (rooms 4-9)',93,'night',45,45),
 (17,6,'diamond','Low-level (rooms 4-9)',93,'poketore',0,0),
 (17,2,'diamond','Low-level (rooms 4-9)',337,'ds-sapphire',0,0),
@@ -4978 +4978 @@
 (17,3,'diamond','High-level (rooms 16-21)',42,'grass',66,66),
 (17,0,'diamond','High-level (rooms 16-21)',42,'swarm',0,0),
-(17,3,'diamond','High-level (rooms 16-21)',42,'morning',0,0),
-(17,5,'diamond','High-level (rooms 16-21)',42,'night',0,0),
+(17,3,'diamond','High-level (rooms 16-21)',42,'daytime',66,66),
+(17,3,'diamond','High-level (rooms 16-21)',42,'night',66,66),
 (17,2,'diamond','High-level (rooms 16-21)',93,'grass',65,65),
 (17,4,'diamond','High-level (rooms 16-21)',93,'grass',66,66),
 (17,6,'diamond','High-level (rooms 16-21)',93,'grass',64,64),
 (17,7,'diamond','High-level (rooms 16-21)',93,'grass',64,64),
-(17,2,'diamond','High-level (rooms 16-21)',93,'morning',0,0),
-(17,4,'diamond','High-level (rooms 16-21)',93,'night',0,0),
+(17,2,'diamond','High-level (rooms 16-21)',93,'daytime',65,65),
+(17,2,'diamond','High-level (rooms 16-21)',93,'night',65,65),
 (17,6,'diamond','High-level (rooms 16-21)',93,'poketore',0,0),
 (17,2,'diamond','High-level (rooms 16-21)',337,'ds-sapphire',0,0),
@@ -5021 +5021 @@
 (18,8,'diamond','',396,'grass',2,2),
 (18,10,'diamond','',396,'grass',2,2),
-(18,2,'diamond','',396,'morning',0,0),
+(18,2,'diamond','',396,'daytime',3,3),
 (18,0,'diamond','',396,'ds-ruby',0,0),
 (18,1,'diamond','',396,'ds-ruby',0,0),
@@ -5036 +5036 @@
 (18,9,'diamond','',399,'grass',2,2),
 (18,11,'diamond','',399,'grass',2,2),
-(18,3,'diamond','',399,'morning',0,0),
-(18,4,'diamond','',399,'night',0,0),
-(18,5,'diamond','',399,'night',0,0),
+(18,3,'diamond','',399,'daytime',3,3),
+(18,2,'diamond','',399,'night',3,3),
+(18,3,'diamond','',399,'night',3,3),
 (19,6,'diamond','',58,'ds-firered',0,0),
 (19,7,'diamond','',58,'ds-firered',0,0),
@@ -5052 +5052 @@
 (19,8,'diamond','',396,'grass',2,2),
 (19,10,'diamond','',396,'grass',2,2),
-(19,2,'diamond','',396,'morning',0,0),
-(19,3,'diamond','',396,'morning',0,0),
+(19,2,'diamond','',396,'daytime',4,4),
+(19,3,'diamond','',396,'daytime',3,3),
 (19,0,'diamond','',396,'ds-ruby',0,0),
 (19,2,'diamond','',396,'ds-sapphire',0,0),
@@ -5067 +5067 @@
 (19,9,'diamond','',399,'ds-leafgreen',0,0),
 (19,3,'diamond','',401,'grass',3,3),
-(19,4,'diamond','',401,'night',0,0),
-(19,5,'diamond','',401,'night',0,0),
+(19,2,'diamond','',401,'night',4,4),
+(19,3,'diamond','',401,'night',3,3),
 (19,0,'diamond','',403,'grass',3,3),
 (19,5,'diamond','',403,'grass',4,4),
-(20,4,'diamond','',41,'night',0,0),
+(20,2,'diamond','',41,'night',5,5),
 (20,0,'diamond','',54,'surfing',20,30),
 (20,1,'diamond','',54,'surfing',20,40),
@@ -5110 +5110 @@
 (20,8,'diamond','',396,'grass',5,5),
 (20,10,'diamond','',396,'grass',6,6),
-(20,2,'diamond','',396,'morning',0,0),
-(20,3,'diamond','',396,'morning',0,0),
+(20,2,'diamond','',396,'daytime',5,5),
+(20,3,'diamond','',396,'daytime',4,4),
 (20,6,'diamond','',396,'ds-firered',0,0),
 (20,8,'diamond','',396,'ds-leafgreen',0,0),
@@ -5120 +5120 @@
 (20,9,'diamond','',399,'ds-leafgreen',0,0),
 (20,3,'diamond','',401,'grass',4,4),
-(20,5,'diamond','',401,'night',0,0),
+(20,3,'diamond','',401,'night',4,4),
 (20,1,'diamond','',403,'grass',4,4),
 (20,7,'diamond','',403,'grass',5,5),
@@ -5127 +5127 @@
 (21,8,'diamond','Jubilife City side',13,'ds-leafgreen',0,0),
 (21,9,'diamond','Jubilife City side',13,'ds-leafgreen',0,0),
-(21,4,'diamond','Jubilife City side',41,'night',0,0),
+(21,2,'diamond','Jubilife City side',41,'night',4,4),
 (21,0,'diamond','Jubilife City side',54,'surfing',20,30),
 (21,1,'diamond','Jubilife City side',54,'surfing',20,40),
@@ -5162 +5162 @@
 (21,10,'diamond','Jubilife City side',396,'grass',6,6),
 (21,0,'diamond','Jubilife City side',396,'swarm',0,0),
-(21,3,'diamond','Jubilife City side',396,'morning',0,0),
+(21,3,'diamond','Jubilife City side',396,'daytime',4,4),
 (21,1,'diamond','Jubilife City side',399,'grass',4,4),
 (21,9,'diamond','Jubilife City side',399,'grass',6,6),
@@ -5168 +5168 @@
 (21,1,'diamond','Jubilife City side',399,'swarm',0,0),
 (21,3,'diamond','Jubilife City side',401,'grass',4,4),
-(21,5,'diamond','Jubilife City side',401,'night',0,0),
+(21,3,'diamond','Jubilife City side',401,'night',4,4),
 (21,5,'diamond','Jubilife City side',403,'grass',4,4),
 (21,7,'diamond','Jubilife City side',403,'grass',5,5),
@@ -5174 +5174 @@
 (21,4,'diamond','Jubilife City side',406,'grass',4,4),
 (21,6,'diamond','Jubilife City side',406,'grass',5,5),
-(21,2,'diamond','Jubilife City side',406,'morning',0,0),
-(21,4,'diamond','Floaroma City side',41,'night',0,0),
+(21,2,'diamond','Jubilife City side',406,'daytime',4,4),
+(21,2,'diamond','Floaroma City side',41,'night',6,6),
 (21,0,'diamond','Floaroma City side',54,'surfing',20,30),
 (21,1,'diamond','Floaroma City side',54,'surfing',20,40),
@@ -5210 +5210 @@
 (21,10,'diamond','Floaroma City side',396,'grass',8,8),
 (21,0,'diamond','Floaroma City side',396,'swarm',0,0),
-(21,3,'diamond','Floaroma City side',396,'morning',0,0),
+(21,3,'diamond','Floaroma City side',396,'daytime',6,6),
 (21,6,'diamond','Floaroma City side',396,'ds-firered',0,0),
 (21,8,'diamond','Floaroma City side',396,'ds-leafgreen',0,0),
@@ -5220 +5220 @@
 (21,9,'diamond','Floaroma City side',399,'ds-leafgreen',0,0),
 (21,3,'diamond','Floaroma City side',401,'grass',6,6),
-(21,5,'diamond','Floaroma City side',401,'night',0,0),
+(21,3,'diamond','Floaroma City side',401,'night',6,6),
 (21,5,'diamond','Floaroma City side',403,'grass',6,6),
 (21,7,'diamond','Floaroma City side',403,'grass',7,7),
@@ -5226 +5226 @@
 (21,4,'diamond','Floaroma City side',406,'grass',6,6),
 (21,6,'diamond','Floaroma City side',406,'grass',7,7),
-(21,2,'diamond','Floaroma City side',406,'morning',0,0),
+(21,2,'diamond','Floaroma City side',406,'daytime',6,6),
 (22,0,'diamond','Eterna City side',54,'surfing',20,30),
 (22,1,'diamond','Eterna City side',54,'surfing',20,40),
@@ -5259 +5259 @@
 (22,11,'diamond','Eterna City side',399,'grass',12,12),
 (22,1,'diamond','Eterna City side',399,'swarm',0,0),
-(22,3,'diamond','Eterna City side',399,'morning',0,0),
-(22,5,'diamond','Eterna City side',399,'night',0,0),
+(22,3,'diamond','Eterna City side',399,'daytime',11,11),
+(22,3,'diamond','Eterna City side',399,'night',11,11),
 (22,1,'diamond','Eterna City side',399,'ds-ruby',0,0),
 (22,5,'diamond','Eterna City side',399,'ds-emerald',0,0),
@@ -5272 +5272 @@
 (22,10,'diamond','Eterna City side',418,'grass',12,12),
 (22,0,'diamond','Eterna City side',418,'swarm',0,0),
-(22,2,'diamond','Eterna City side',418,'morning',0,0),
-(22,4,'diamond','Eterna City side',418,'night',0,0),
+(22,2,'diamond','Eterna City side',418,'daytime',11,11),
+(22,2,'diamond','Eterna City side',418,'night',11,11),
 (22,0,'diamond','Eterna City side',418,'ds-ruby',0,0),
 (22,4,'diamond','Eterna City side',418,'ds-emerald',0,0),
@@ -5307 +5307 @@
 (22,10,'diamond','Floaroma City side',418,'grass',10,10),
 (22,0,'diamond','Floaroma City side',418,'swarm',0,0),
-(22,2,'diamond','Floaroma City side',418,'morning',0,0),
-(22,4,'diamond','Floaroma City side',418,'night',0,0),
+(22,2,'diamond','Floaroma City side',418,'daytime',9,9),
+(22,2,'diamond','Floaroma City side',418,'night',9,9),
 (22,0,'diamond','Floaroma City side',418,'ds-ruby',0,0),
 (22,2,'diamond','Floaroma City side',418,'ds-sapphire',0,0),
@@ -5319 +5319 @@
 (22,11,'diamond','Floaroma City side',422,'grass',10,10),
 (22,1,'diamond','Floaroma City side',422,'swarm',0,0),
-(22,3,'diamond','Floaroma City side',422,'morning',0,0),
-(22,5,'diamond','Floaroma City side',422,'night',0,0),
+(22,3,'diamond','Floaroma City side',422,'daytime',9,9),
+(22,3,'diamond','Floaroma City side',422,'night',9,9),
 (22,1,'diamond','Floaroma City side',422,'ds-ruby',0,0),
 (22,3,'diamond','Floaroma City side',422,'ds-sapphire',0,0),
@@ -5331 +5331 @@
 (22,3,'diamond','Floaroma City side',457,'super-rod',20,50),
 (22,4,'diamond','Floaroma City side',457,'super-rod',20,50),
-(23,4,'diamond','',41,'night',0,0),
+(23,2,'diamond','',41,'night',15,15),
 (23,4,'diamond','',74,'grass',14,14),
 (23,0,'diamond','',77,'grass',14,14),
@@ -5337 +5337 @@
 (23,8,'diamond','',77,'grass',15,15),
 (23,10,'diamond','',77,'grass',16,16),
-(23,2,'diamond','',77,'morning',0,0),
-(23,3,'diamond','',77,'morning',0,0),
+(23,2,'diamond','',77,'daytime',15,15),
+(23,3,'diamond','',77,'daytime',14,14),
 (23,0,'diamond','',77,'ds-ruby',0,0),
 (23,2,'diamond','',77,'ds-sapphire',0,0),
@@ -5353 +5353 @@
 (23,3,'diamond','',401,'grass',14,14),
 (23,5,'diamond','',402,'grass',15,15),
-(23,5,'diamond','',402,'night',0,0),
+(23,3,'diamond','',402,'night',14,14),
 (23,1,'diamond','',434,'grass',14,14),
 (23,9,'diamond','',434,'grass',15,15),
@@ -5363 +5363 @@
 (23,6,'diamond','',436,'grass',15,15),
 (23,7,'diamond','',436,'grass',15,15),
-(24,4,'diamond','',41,'night',0,0),
+(24,2,'diamond','',41,'night',6,6),
 (24,0,'diamond','',66,'grass',5,5),
 (24,2,'diamond','',66,'grass',6,6),
 (24,8,'diamond','',66,'grass',7,7),
 (24,10,'diamond','',66,'grass',7,7),
-(24,2,'diamond','',66,'morning',0,0),
-(24,3,'diamond','',66,'morning',0,0),
+(24,2,'diamond','',66,'daytime',6,6),
+(24,3,'diamond','',66,'daytime',6,6),
 (24,0,'diamond','',66,'ds-ruby',0,0),
 (24,2,'diamond','',66,'ds-sapphire',0,0),
@@ -5394 +5394 @@
 (24,9,'diamond','',246,'poketore',0,0),
 (24,3,'diamond','',401,'grass',6,6),
-(24,5,'diamond','',401,'night',0,0),
-(25,4,'diamond','',41,'night',0,0),
-(25,5,'diamond','',41,'night',0,0),
+(24,3,'diamond','',401,'night',6,6),
+(25,2,'diamond','',41,'night',16,16),
+(25,3,'diamond','',41,'night',16,16),
 (25,0,'diamond','',54,'grass',16,16),
 (25,6,'diamond','',54,'grass',17,17),
@@ -5411 +5411 @@
 (25,3,'diamond','',66,'grass',16,16),
 (25,5,'diamond','',66,'grass',17,17),
-(25,3,'diamond','',66,'morning',0,0),
+(25,3,'diamond','',66,'daytime',16,16),
 (25,0,'diamond','',129,'old-rod',4,6),
 (25,1,'diamond','',129,'old-rod',3,7),
@@ -5429 +5429 @@
 (25,2,'diamond','',307,'grass',16,16),
 (25,4,'diamond','',307,'grass',17,17),
-(25,2,'diamond','',307,'morning',0,0),
+(25,2,'diamond','',307,'daytime',16,16),
 (25,0,'diamond','',335,'ds-ruby',0,0),
 (25,1,'diamond','',335,'ds-ruby',0,0),
@@ -5449 +5449 @@
 (26,8,'diamond','',37,'ds-leafgreen',0,0),
 (26,9,'diamond','',37,'ds-leafgreen',0,0),
-(26,5,'diamond','',41,'night',0,0),
+(26,3,'diamond','',41,'night',16,16),
 (26,0,'diamond','',54,'surfing',20,30),
 (26,1,'diamond','',54,'surfing',20,40),
@@ -5455 +5455 @@
 (26,3,'diamond','',55,'surfing',30,40),
 (26,4,'diamond','',55,'surfing',20,40),
-(26,4,'diamond','',92,'night',0,0),
+(26,2,'diamond','',92,'night',16,16),
 (26,8,'diamond','',113,'grass',16,16),
 (26,10,'diamond','',113,'grass',16,16),
@@ -5486 +5486 @@
 (26,5,'diamond','',397,'grass',17,17),
 (26,7,'diamond','',397,'grass',18,18),
-(26,2,'diamond','',397,'morning',0,0),
+(26,2,'diamond','',397,'daytime',16,16),
 (26,1,'diamond','',400,'grass',16,16),
 (26,4,'diamond','',400,'grass',17,17),
 (26,6,'diamond','',400,'grass',18,18),
-(26,3,'diamond','',400,'morning',0,0),
+(26,3,'diamond','',400,'daytime',16,16),
 (26,2,'diamond','',439,'grass',16,16),
 (26,3,'diamond','',439,'grass',16,16),
@@ -5508 +5508 @@
 (27,3,'diamond','Celestic City side',66,'grass',25,25),
 (27,5,'diamond','Celestic City side',66,'grass',26,26),
-(27,3,'diamond','Celestic City side',66,'morning',0,0),
+(27,3,'diamond','Celestic City side',66,'daytime',25,25),
 (27,6,'diamond','Celestic City side',67,'grass',26,26),
 (27,8,'diamond','Celestic City side',67,'grass',26,26),
@@ -5524 +5524 @@
 (27,0,'diamond','Celestic City side',130,'super-rod',30,40),
 (27,2,'diamond','Celestic City side',130,'super-rod',40,55),
-(27,4,'diamond','Celestic City side',163,'night',0,0),
-(27,5,'diamond','Celestic City side',164,'night',0,0),
+(27,2,'diamond','Celestic City side',163,'night',24,24),
+(27,3,'diamond','Celestic City side',164,'night',25,25),
 (27,2,'diamond','Celestic City side',307,'grass',24,24),
 (27,4,'diamond','Celestic City side',307,'grass',25,25),
@@ -5531 +5531 @@
 (27,9,'diamond','Celestic City side',307,'grass',26,26),
 (27,11,'diamond','Celestic City side',307,'grass',26,26),
-(27,2,'diamond','Celestic City side',307,'morning',0,0),
+(27,2,'diamond','Celestic City side',307,'daytime',24,24),
 (27,5,'diamond','Celestic City side',307,'ds-emerald',0,0),
 (27,7,'diamond','Celestic City side',307,'ds-firered',0,0),
@@ -5558 +5558 @@
 (27,7,'diamond','Solaceon City side',77,'grass',20,20),
 (27,0,'diamond','Solaceon City side',77,'swarm',0,0),
-(27,2,'diamond','Solaceon City side',77,'morning',0,0),
-(27,3,'diamond','Solaceon City side',77,'morning',0,0),
+(27,2,'diamond','Solaceon City side',77,'daytime',18,18),
+(27,3,'diamond','Solaceon City side',77,'daytime',18,18),
 (27,8,'diamond','Solaceon City side',113,'grass',18,18),
 (27,10,'diamond','Solaceon City side',113,'grass',20,20),
@@ -5574 +5574 @@
 (27,1,'diamond','Solaceon City side',274,'ds-ruby',0,0),
 (27,5,'diamond','Solaceon City side',402,'grass',19,19),
-(27,4,'diamond','Solaceon City side',402,'night',0,0),
-(27,5,'diamond','Solaceon City side',402,'night',0,0),
+(27,2,'diamond','Solaceon City side',402,'night',18,18),
+(27,3,'diamond','Solaceon City side',402,'night',18,18),
 (27,2,'diamond','Solaceon City side',439,'grass',18,18),
 (27,3,'diamond','Solaceon City side',439,'grass',18,18),
@@ -5583 +5583 @@
 (27,7,'diamond','Solaceon City side',439,'ds-firered',0,0),
 (27,9,'diamond','Solaceon City side',439,'ds-leafgreen',0,0),
-(28,4,'diamond','Eterna City side',41,'night',0,0),
+(28,2,'diamond','Eterna City side',41,'night',12,12),
 (28,4,'diamond','Eterna City side',74,'grass',13,13),
 (28,5,'diamond','Eterna City side',77,'grass',13,13),
-(28,5,'diamond','Eterna City side',163,'night',0,0),
+(28,3,'diamond','Eterna City side',163,'night',14,14),
 (28,4,'diamond','Eterna City side',216,'ds-emerald',0,0),
 (28,5,'diamond','Eterna City side',216,'ds-emerald',0,0),
@@ -5598 +5598 @@
 (28,11,'diamond','Eterna City side',307,'grass',14,14),
 (28,0,'diamond','Eterna City side',307,'swarm',0,0),
-(28,2,'diamond','Eterna City side',307,'morning',0,0),
+(28,2,'diamond','Eterna City side',307,'daytime',12,12),
 (28,1,'diamond','Eterna City side',307,'ds-ruby',0,0),
 (28,3,'diamond','Eterna City side',307,'ds-sapphire',0,0),
@@ -5608 +5608 @@
 (28,10,'diamond','Eterna City side',399,'grass',12,12),
 (28,1,'diamond','Eterna City side',399,'swarm',0,0),
-(28,3,'diamond','Eterna City side',399,'morning',0,0),
+(28,3,'diamond','Eterna City side',399,'daytime',14,14),
 (28,0,'diamond','Eterna City side',399,'ds-ruby',0,0),
 (28,2,'diamond','Eterna City side',399,'ds-sapphire',0,0),
@@ -5615 +5615 @@
 (28,6,'diamond','Eterna City side',433,'grass',13,13),
 (28,7,'diamond','Eterna City side',433,'grass',13,13),
-(28,4,'diamond','Celestic City side',41,'night',0,0),
+(28,2,'diamond','Celestic City side',41,'night',26,26),
 (28,3,'diamond','Celestic City side',67,'grass',28,28),
 (28,4,'diamond','Celestic City side',67,'grass',27,27),
-(28,3,'diamond','Celestic City side',67,'morning',0,0),
+(28,3,'diamond','Celestic City side',67,'daytime',28,28),
 (28,1,'diamond','Celestic City side',75,'grass',27,27),
 (28,1,'diamond','Celestic City side',75,'swarm',0,0),
@@ -5624 +5624 @@
 (28,9,'diamond','Celestic City side',77,'grass',27,27),
 (28,11,'diamond','Celestic City side',77,'grass',28,28),
-(28,2,'diamond','Celestic City side',77,'morning',0,0),
+(28,2,'diamond','Celestic City side',77,'daytime',26,26),
 (28,1,'diamond','Celestic City side',77,'ds-ruby',0,0),
 (28,3,'diamond','Celestic City side',77,'ds-sapphire',0,0),
 (28,7,'diamond','Celestic City side',77,'ds-firered',0,0),
 (28,9,'diamond','Celestic City side',77,'ds-leafgreen',0,0),
-(28,5,'diamond','Celestic City side',164,'night',0,0),
+(28,3,'diamond','Celestic City side',164,'night',28,28),
 (28,4,'diamond','Celestic City side',216,'ds-emerald',0,0),
 (28,5,'diamond','Celestic City side',216,'ds-emerald',0,0),
@@ -5680 +5680 @@
 (29,5,'diamond','Pastoria City side',315,'grass',18,18),
 (29,6,'diamond','Pastoria City side',315,'grass',20,20),
-(29,2,'diamond','Pastoria City side',315,'morning',0,0),
+(29,2,'diamond','Pastoria City side',315,'daytime',19,19),
 (29,1,'diamond','Pastoria City side',339,'good-rod',15,20),
 (29,3,'diamond','Pastoria City side',339,'good-rod',10,25),
@@ -5692 +5692 @@
 (29,10,'diamond','Pastoria City side',400,'grass',20,20),
 (29,1,'diamond','Pastoria City side',400,'swarm',0,0),
-(29,3,'diamond','Pastoria City side',400,'morning',0,0),
+(29,3,'diamond','Pastoria City side',400,'daytime',19,19),
 (29,0,'diamond','Pastoria City side',400,'ds-ruby',0,0),
 (29,4,'diamond','Pastoria City side',400,'ds-emerald',0,0),
 (29,8,'diamond','Pastoria City side',400,'ds-leafgreen',0,0),
 (29,4,'diamond','Pastoria City side',402,'grass',18,18),
-(29,4,'diamond','Pastoria City side',402,'night',0,0),
-(29,5,'diamond','Pastoria City side',402,'night',0,0),
+(29,2,'diamond','Pastoria City side',402,'night',19,19),
+(29,3,'diamond','Pastoria City side',402,'night',19,19),
 (29,0,'diamond','Hearthome City side',54,'surfing',20,30),
 (29,1,'diamond','Hearthome City side',54,'surfing',20,40),
@@ -5729 +5729 @@
 (29,2,'diamond','Hearthome City side',397,'grass',17,17),
 (29,7,'diamond','Hearthome City side',397,'grass',18,18),
-(29,2,'diamond','Hearthome City side',397,'morning',0,0),
-(29,3,'diamond','Hearthome City side',397,'morning',0,0),
+(29,2,'diamond','Hearthome City side',397,'daytime',17,17),
+(29,3,'diamond','Hearthome City side',397,'daytime',17,17),
 (29,3,'diamond','Hearthome City side',402,'grass',17,17),
 (29,8,'diamond','Hearthome City side',402,'grass',17,17),
@@ -5736 +5736 @@
 (29,10,'diamond','Hearthome City side',402,'grass',18,18),
 (29,11,'diamond','Hearthome City side',402,'grass',18,18),
-(29,4,'diamond','Hearthome City side',402,'night',0,0),
-(29,5,'diamond','Hearthome City side',402,'night',0,0),
+(29,2,'diamond','Hearthome City side',402,'night',17,17),
+(29,3,'diamond','Hearthome City side',402,'night',17,17),
 (29,0,'diamond','Hearthome City side',402,'ds-ruby',0,0),
 (29,1,'diamond','Hearthome City side',402,'ds-ruby',0,0),
@@ -5774 +5774 @@
 (30,5,'diamond','',278,'grass',20,20),
 (30,1,'diamond','',278,'surfing',20,30),
-(30,3,'diamond','',278,'morning',0,0),
+(30,3,'diamond','',278,'daytime',20,20),
 (30,3,'diamond','',279,'surfing',20,40),
 (30,4,'diamond','',279,'surfing',20,40),
@@ -5782 +5782 @@
 (30,0,'diamond','',418,'grass',20,20),
 (30,2,'diamond','',418,'grass',21,21),
-(30,2,'diamond','',418,'morning',0,0),
-(30,4,'diamond','',418,'night',0,0),
+(30,2,'diamond','',418,'daytime',21,21),
+(30,2,'diamond','',418,'night',21,21),
 (30,6,'diamond','',419,'grass',22,22),
 (30,8,'diamond','',419,'grass',22,22),
@@ -5797 +5797 @@
 (30,9,'diamond','',422,'grass',22,22),
 (30,11,'diamond','',422,'grass',22,22),
-(30,5,'diamond','',422,'night',0,0),
+(30,3,'diamond','',422,'night',20,20),
 (30,1,'diamond','',422,'ds-ruby',0,0),
 (30,3,'diamond','',422,'ds-sapphire',0,0),
@@ -5814 +5814 @@
 (31,9,'diamond','',75,'grass',24,24),
 (31,11,'diamond','',75,'grass',24,24),
-(31,3,'diamond','',75,'morning',0,0),
+(31,3,'diamond','',75,'daytime',23,23),
 (31,1,'diamond','',75,'ds-ruby',0,0),
 (31,3,'diamond','',75,'ds-sapphire',0,0),
@@ -5821 +5821 @@
 (31,2,'diamond','',77,'grass',23,23),
 (31,7,'diamond','',77,'grass',24,24),
-(31,2,'diamond','',77,'morning',0,0),
+(31,2,'diamond','',77,'daytime',23,23),
 (31,1,'diamond','',118,'good-rod',15,20),
 (31,3,'diamond','',118,'good-rod',10,25),
@@ -5847 +5847 @@
 (31,1,'diamond','',325,'swarm',0,0),
 (31,6,'diamond','',402,'grass',24,24),
-(31,4,'diamond','',402,'night',0,0),
-(31,5,'diamond','',402,'night',0,0),
+(31,2,'diamond','',402,'night',23,23),
+(31,3,'diamond','',402,'night',23,23),
 (31,4,'diamond','',434,'grass',23,23),
 (31,8,'diamond','',434,'grass',24,24),
@@ -5874 +5874 @@
 (32,0,'diamond','',77,'grass',21,21),
 (32,2,'diamond','',77,'grass',22,22),
-(32,2,'diamond','',77,'morning',0,0),
-(32,3,'diamond','',77,'morning',0,0),
+(32,2,'diamond','',77,'daytime',22,22),
+(32,3,'diamond','',77,'daytime',21,21),
 (32,0,'diamond','',96,'swarm',0,0),
 (32,1,'diamond','',96,'swarm',0,0),
@@ -5885 +5885 @@
 (32,9,'diamond','',262,'poketore',0,0),
 (32,5,'diamond','',402,'grass',20,20),
-(32,4,'diamond','',402,'night',0,0),
-(32,5,'diamond','',402,'night',0,0),
-(33,4,'diamond','',41,'night',0,0),
+(32,2,'diamond','',402,'night',22,22),
+(32,3,'diamond','',402,'night',21,21),
+(33,2,'diamond','',41,'night',33,33),
 (33,3,'diamond','',67,'grass',33,33),
 (33,5,'diamond','',67,'grass',34,34),
-(33,3,'diamond','',67,'morning',0,0),
+(33,3,'diamond','',67,'daytime',33,33),
 (33,8,'diamond','',75,'grass',33,33),
 (33,9,'diamond','',75,'grass',34,34),
@@ -5903 +5903 @@
 (33,8,'diamond','',75,'ds-leafgreen',0,0),
 (33,9,'diamond','',75,'ds-leafgreen',0,0),
-(33,5,'diamond','',164,'night',0,0),
+(33,3,'diamond','',164,'night',33,33),
 (33,1,'diamond','',215,'grass',32,32),
 (33,7,'diamond','',215,'grass',33,33),
@@ -5912 +5912 @@
 (33,2,'diamond','',307,'grass',33,33),
 (33,4,'diamond','',307,'grass',34,34),
-(33,2,'diamond','',307,'morning',0,0),
+(33,2,'diamond','',307,'daytime',33,33),
 (33,6,'diamond','',361,'poketore',0,0),
 (33,7,'diamond','',361,'poketore',0,0),
@@ -5919 +5919 @@
 (33,0,'diamond','',459,'grass',32,32),
 (33,6,'diamond','',459,'grass',33,33),
-(34,4,'diamond','',41,'night',0,0),
+(34,2,'diamond','',41,'night',35,35),
 (34,3,'diamond','',67,'grass',35,35),
 (34,5,'diamond','',67,'grass',36,36),
-(34,3,'diamond','',67,'morning',0,0),
-(34,5,'diamond','',164,'night',0,0),
+(34,3,'diamond','',67,'daytime',35,35),
+(34,3,'diamond','',164,'night',35,35),
 (34,1,'diamond','',215,'grass',34,34),
 (34,7,'diamond','',215,'grass',35,35),
@@ -5931 +5931 @@
 (34,1,'diamond','',220,'swarm',0,0),
 (34,2,'diamond','',307,'grass',35,35),
-(34,2,'diamond','',307,'morning',0,0),
+(34,2,'diamond','',307,'daytime',35,35),
 (34,4,'diamond','',308,'grass',35,35),
 (34,8,'diamond','',308,'grass',36,36),
@@ -5983 +5983 @@
 (35,2,'diamond','',419,'grass',29,29),
 (35,6,'diamond','',419,'grass',30,30),
-(35,2,'diamond','',419,'morning',0,0),
-(35,4,'diamond','',419,'night',0,0),
+(35,2,'diamond','',419,'daytime',29,29),
+(35,2,'diamond','',419,'night',29,29),
 (35,1,'diamond','',422,'grass',28,28),
 (35,3,'diamond','',423,'grass',28,28),
@@ -5990 +5990 @@
 (35,9,'diamond','',423,'grass',30,30),
 (35,11,'diamond','',423,'grass',30,30),
-(35,3,'diamond','',423,'morning',0,0),
-(35,5,'diamond','',423,'night',0,0),
+(35,3,'diamond','',423,'daytime',28,28),
+(35,3,'diamond','',423,'night',28,28),
 (35,1,'diamond','',423,'ds-ruby',0,0),
 (35,3,'diamond','',423,'ds-sapphire',0,0),
@@ -6044 +6044 @@
 (37,4,'diamond','',279,'surfing',20,40),
 (37,2,'diamond','',315,'grass',29,29),
-(37,2,'diamond','',315,'morning',0,0),
-(37,4,'diamond','',315,'night',0,0),
+(37,2,'diamond','',315,'daytime',29,29),
+(37,2,'diamond','',315,'night',29,29),
 (37,2,'diamond','',366,'super-rod',20,30),
 (37,0,'diamond','',419,'grass',28,28),
 (37,6,'diamond','',419,'grass',30,30),
 (37,3,'diamond','',422,'grass',28,28),
-(37,3,'diamond','',422,'morning',0,0),
-(37,5,'diamond','',422,'night',0,0),
+(37,3,'diamond','',422,'daytime',28,28),
+(37,3,'diamond','',422,'night',28,28),
 (37,7,'diamond','',423,'grass',29,29),
 (37,9,'diamond','',423,'grass',30,30),
@@ -6112 +6112 @@
 (38,0,'diamond','',419,'grass',40,40),
 (38,6,'diamond','',419,'grass',42,42),
-(38,4,'diamond','',419,'night',0,0),
+(38,2,'diamond','',419,'night',41,41),
 (38,1,'diamond','',423,'grass',40,40),
 (38,7,'diamond','',423,'grass',41,41),
 (38,9,'diamond','',423,'grass',42,42),
 (38,11,'diamond','',423,'grass',42,42),
-(38,5,'diamond','',423,'night',0,0),
+(38,3,'diamond','',423,'night',40,40),
 (38,1,'diamond','',423,'ds-ruby',0,0),
 (38,3,'diamond','',423,'ds-sapphire',0,0),
@@ -6125 +6125 @@
 (38,2,'diamond','',441,'grass',41,41),
 (38,3,'diamond','',441,'grass',40,40),
-(38,2,'diamond','',441,'morning',0,0),
-(38,3,'diamond','',441,'morning',0,0),
+(38,2,'diamond','',441,'daytime',41,41),
+(38,3,'diamond','',441,'daytime',40,40),
 (39,6,'diamond','',44,'grass',53,53),
 (39,7,'diamond','',70,'grass',53,53),
@@ -6171 +6171 @@
 (39,8,'diamond','',418,'ds-leafgreen',0,0),
 (39,0,'diamond','',419,'grass',53,53),
-(39,4,'diamond','',419,'night',0,0),
+(39,2,'diamond','',419,'night',54,54),
 (39,10,'diamond','',422,'grass',23,23),
 (39,1,'diamond','',423,'grass',53,53),
-(39,5,'diamond','',423,'night',0,0),
+(39,3,'diamond','',423,'night',52,52),
 (39,2,'diamond','',441,'grass',54,54),
 (39,3,'diamond','',441,'grass',52,52),
-(39,2,'diamond','',441,'morning',0,0),
-(39,3,'diamond','',441,'morning',0,0),
+(39,2,'diamond','',441,'daytime',54,54),
+(39,3,'diamond','',441,'daytime',52,52),
 (40,9,'diamond','',19,'grass',20,20),
 (40,11,'diamond','',19,'grass',22,22),
@@ -6198 +6198 @@
 (40,2,'diamond','',22,'grass',50,50),
 (40,3,'diamond','',22,'grass',52,52),
-(40,2,'diamond','',22,'morning',0,0),
-(40,3,'diamond','',22,'morning',0,0),
+(40,2,'diamond','',22,'daytime',50,50),
+(40,3,'diamond','',22,'daytime',52,52),
 (40,0,'diamond','',55,'surfing',40,50),
 (40,2,'diamond','',55,'surfing',45,55),
@@ -6228 +6228 @@
 (40,1,'diamond','',296,'swarm',0,0),
 (40,7,'diamond','',315,'grass',51,51),
-(40,4,'diamond','',354,'night',0,0),
-(40,5,'diamond','',354,'night',0,0),
+(40,2,'diamond','',354,'night',50,50),
+(40,3,'diamond','',354,'night',52,52),
 (40,5,'diamond','',435,'grass',51,51),
 (41,2,'diamond','',22,'grass',54,54),
 (41,4,'diamond','',22,'grass',55,55),
-(41,2,'diamond','',22,'morning',0,0),
-(41,5,'diamond','',42,'night',0,0),
+(41,2,'diamond','',22,'daytime',54,54),
+(41,3,'diamond','',42,'night',54,54),
 (41,1,'diamond','',60,'surfing',20,30),
 (41,0,'diamond','',61,'surfing',40,50),
@@ -6242 +6242 @@
 (41,3,'diamond','',75,'grass',54,54),
 (41,7,'diamond','',75,'grass',56,56),
-(41,3,'diamond','',75,'morning',0,0),
+(41,3,'diamond','',75,'daytime',54,54),
 (41,5,'diamond','',110,'grass',55,55),
 (41,9,'diamond','',111,'grass',22,22),
@@ -6282 +6282 @@
 (41,3,'diamond','',340,'super-rod',20,50),
 (41,4,'diamond','',340,'super-rod',20,50),
-(41,4,'diamond','',354,'night',0,0),
+(41,2,'diamond','',354,'night',54,54),
 (42,8,'diamond','',28,'ds-leafgreen',0,0),
 (42,9,'diamond','',28,'ds-leafgreen',0,0),
@@ -6301 +6301 @@
 (42,3,'diamond','',112,'grass',52,52),
 (42,4,'diamond','',112,'grass',53,53),
-(42,3,'diamond','',112,'morning',0,0),
+(42,3,'diamond','',112,'daytime',52,52),
 (42,0,'diamond','',129,'old-rod',4,6),
 (42,1,'diamond','',129,'old-rod',3,7),
@@ -6322 +6322 @@
 (42,7,'diamond','',331,'ds-firered',0,0),
 (42,1,'diamond','',332,'grass',53,53),
-(42,4,'diamond','',332,'night',0,0),
-(42,5,'diamond','',332,'night',0,0),
+(42,2,'diamond','',332,'night',52,52),
+(42,3,'diamond','',332,'night',52,52),
 (42,1,'diamond','',339,'good-rod',15,20),
 (42,3,'diamond','',339,'good-rod',10,25),
@@ -6334 +6334 @@
 (42,2,'diamond','',450,'grass',52,52),
 (42,5,'diamond','',450,'grass',54,54),
-(42,2,'diamond','',450,'morning',0,0),
+(42,2,'diamond','',450,'daytime',52,52),
 (43,0,'diamond','',16,'swarm',0,0),
 (43,1,'diamond','',16,'swarm',0,0),
@@ -6342 +6342 @@
 (43,9,'diamond','',43,'ds-leafgreen',0,0),
 (43,1,'diamond','',44,'grass',51,51),
-(43,3,'diamond','',44,'morning',0,0),
+(43,3,'diamond','',44,'daytime',52,52),
 (43,8,'diamond','',48,'poketore',0,0),
 (43,9,'diamond','',48,'poketore',0,0),
@@ -6352 +6352 @@
 (43,8,'diamond','',69,'ds-leafgreen',0,0),
 (43,0,'diamond','',70,'grass',51,51),
-(43,2,'diamond','',70,'morning',0,0),
+(43,2,'diamond','',70,'daytime',52,52),
 (43,6,'diamond','',123,'grass',52,52),
 (43,0,'diamond','',129,'old-rod',4,6),
@@ -6371 +6371 @@
 (43,2,'diamond','',166,'grass',52,52),
 (43,3,'diamond','',166,'grass',52,52),
-(43,4,'diamond','',168,'night',0,0),
-(43,5,'diamond','',168,'night',0,0),
+(43,2,'diamond','',168,'night',52,52),
+(43,3,'diamond','',168,'night',52,52),
 (43,4,'diamond','',204,'ds-emerald',0,0),
 (43,5,'diamond','',204,'ds-emerald',0,0),
@@ -6411 +6411 @@
 (44,4,'diamond','Area 1',130,'good-rod',15,30),
 (44,2,'diamond','Area 1',130,'super-rod',40,55),
-(44,4,'diamond','Area 1',163,'night',0,0),
-(44,5,'diamond','Area 1',164,'night',0,0),
+(44,2,'diamond','Area 1',163,'night',24,24),
+(44,3,'diamond','Area 1',164,'night',26,26),
 (44,4,'diamond','Area 1',183,'grass',25,25),
 (44,6,'diamond','Area 1',183,'grass',26,26),
@@ -6432 +6432 @@
 (44,0,'diamond','Area 1',340,'super-rod',30,55),
 (44,3,'diamond','Area 1',396,'grass',26,26),
-(44,3,'diamond','Area 1',396,'morning',0,0),
+(44,3,'diamond','Area 1',396,'daytime',26,26),
 (44,10,'diamond','Area 1',399,'grass',26,26),
 (44,8,'diamond','Area 1',399,'poketore',0,0),
@@ -6438 +6438 @@
 (44,1,'diamond','Area 1',400,'swarm',0,0),
 (44,2,'diamond','Area 1',406,'grass',24,24),
-(44,2,'diamond','Area 1',406,'morning',0,0),
+(44,2,'diamond','Area 1',406,'daytime',24,24),
 (44,6,'diamond','Area 2',24,'ds-firered',0,0),
 (44,7,'diamond','Area 2',24,'ds-firered',0,0),
@@ -6463 +6463 @@
 (44,4,'diamond','Area 2',130,'good-rod',15,30),
 (44,2,'diamond','Area 2',130,'super-rod',40,55),
-(44,4,'diamond','Area 2',163,'night',0,0),
-(44,5,'diamond','Area 2',164,'night',0,0),
+(44,2,'diamond','Area 2',163,'night',24,24),
+(44,3,'diamond','Area 2',164,'night',26,26),
 (44,4,'diamond','Area 2',183,'grass',25,25),
 (44,6,'diamond','Area 2',183,'grass',26,26),
@@ -6484 +6484 @@
 (44,0,'diamond','Area 2',340,'super-rod',30,55),
 (44,3,'diamond','Area 2',396,'grass',26,26),
-(44,3,'diamond','Area 2',396,'morning',0,0),
+(44,3,'diamond','Area 2',396,'daytime',26,26),
 (44,10,'diamond','Area 2',399,'grass',26,26),
 (44,8,'diamond','Area 2',399,'poketore',0,0),
@@ -6490 +6490 @@
 (44,1,'diamond','Area 2',400,'swarm',0,0),
 (44,2,'diamond','Area 2',406,'grass',24,24),
-(44,2,'diamond','Area 2',406,'morning',0,0),
+(44,2,'diamond','Area 2',406,'daytime',24,24),
 (44,6,'diamond','Area 3',24,'ds-firered',0,0),
 (44,7,'diamond','Area 3',24,'ds-firered',0,0),
@@ -6515 +6515 @@
 (44,4,'diamond','Area 3',130,'good-rod',15,30),
 (44,2,'diamond','Area 3',130,'super-rod',40,55),
-(44,4,'diamond','Area 3',163,'night',0,0),
-(44,5,'diamond','Area 3',163,'night',0,0),
+(44,2,'diamond','Area 3',163,'night',22,22),
+(44,3,'diamond','Area 3',163,'night',24,24),
 (44,4,'diamond','Area 3',183,'grass',23,23),
 (44,6,'diamond','Area 3',183,'grass',24,24),
@@ -6536 +6536 @@
 (44,0,'diamond','Area 3',340,'super-rod',30,55),
 (44,3,'diamond','Area 3',396,'grass',24,24),
-(44,3,'diamond','Area 3',396,'morning',0,0),
+(44,3,'diamond','Area 3',396,'daytime',24,24),
 (44,10,'diamond','Area 3',399,'grass',24,24),
 (44,8,'diamond','Area 3',399,'poketore',0,0),
@@ -6542 +6542 @@
 (44,1,'diamond','Area 3',400,'swarm',0,0),
 (44,2,'diamond','Area 3',406,'grass',22,22),
-(44,2,'diamond','Area 3',406,'morning',0,0),
+(44,2,'diamond','Area 3',406,'daytime',22,22),
 (44,6,'diamond','Area 4',24,'ds-firered',0,0),
 (44,7,'diamond','Area 4',24,'ds-firered',0,0),
@@ -6567 +6567 @@
 (44,4,'diamond','Area 4',130,'good-rod',15,30),
 (44,2,'diamond','Area 4',130,'super-rod',40,55),
-(44,4,'diamond','Area 4',163,'night',0,0),
-(44,5,'diamond','Area 4',163,'night',0,0),
+(44,2,'diamond','Area 4',163,'night',22,22),
+(44,3,'diamond','Area 4',163,'night',24,24),
 (44,4,'diamond','Area 4',183,'grass',23,23),
 (44,6,'diamond','Area 4',183,'grass',24,24),
@@ -6588 +6588 @@
 (44,0,'diamond','Area 4',340,'super-rod',30,55),
 (44,3,'diamond','Area 4',396,'grass',24,24),
-(44,3,'diamond','Area 4',396,'morning',0,0),
+(44,3,'diamond','Area 4',396,'daytime',24,24),
 (44,10,'diamond','Area 4',399,'grass',24,24),
 (44,8,'diamond','Area 4',399,'poketore',0,0),
@@ -6594 +6594 @@
 (44,1,'diamond','Area 4',400,'swarm',0,0),
 (44,2,'diamond','Area 4',406,'grass',22,22),
-(44,2,'diamond','Area 4',406,'morning',0,0),
+(44,2,'diamond','Area 4',406,'daytime',22,22),
 (44,6,'diamond','Area 5',24,'ds-firered',0,0),
 (44,7,'diamond','Area 5',24,'ds-firered',0,0),
-(44,4,'diamond','Area 5',163,'night',0,0),
-(44,5,'diamond','Area 5',163,'night',0,0),
+(44,2,'diamond','Area 5',163,'night',20,20),
+(44,3,'diamond','Area 5',163,'night',22,22),
 (44,4,'diamond','Area 5',183,'grass',21,21),
 (44,6,'diamond','Area 5',183,'grass',22,22),
@@ -6615 +6615 @@
 (44,9,'diamond','Area 5',298,'ds-leafgreen',0,0),
 (44,3,'diamond','Area 5',396,'grass',22,22),
-(44,3,'diamond','Area 5',396,'morning',0,0),
+(44,3,'diamond','Area 5',396,'daytime',22,22),
 (44,8,'diamond','Area 5',399,'grass',22,22),
 (44,10,'diamond','Area 5',399,'grass',22,22),
@@ -6626 +6626 @@
 (44,1,'diamond','Area 5',400,'swarm',0,0),
 (44,2,'diamond','Area 5',406,'grass',20,20),
-(44,2,'diamond','Area 5',406,'morning',0,0),
+(44,2,'diamond','Area 5',406,'daytime',20,20),
 (44,6,'diamond','Area 6',24,'ds-firered',0,0),
 (44,7,'diamond','Area 6',24,'ds-firered',0,0),
@@ -6651 +6651 @@
 (44,4,'diamond','Area 6',130,'good-rod',15,30),
 (44,2,'diamond','Area 6',130,'super-rod',40,55),
-(44,4,'diamond','Area 6',163,'night',0,0),
-(44,5,'diamond','Area 6',163,'night',0,0),
+(44,2,'diamond','Area 6',163,'night',20,20),
+(44,3,'diamond','Area 6',163,'night',22,22),
 (44,4,'diamond','Area 6',183,'grass',21,21),
 (44,6,'diamond','Area 6',183,'grass',22,22),
@@ -6672 +6672 @@
 (44,0,'diamond','Area 6',340,'super-rod',30,55),
 (44,3,'diamond','Area 6',396,'grass',22,22),
-(44,3,'diamond','Area 6',396,'morning',0,0),
+(44,3,'diamond','Area 6',396,'daytime',22,22),
 (44,10,'diamond','Area 6',399,'grass',22,22),
 (44,8,'diamond','Area 6',399,'poketore',0,0),
@@ -6678 +6678 @@
 (44,1,'diamond','Area 6',400,'swarm',0,0),
 (44,2,'diamond','Area 6',406,'grass',20,20),
-(44,2,'diamond','Area 6',406,'morning',0,0),
+(44,2,'diamond','Area 6',406,'daytime',20,20),
 (45,0,'diamond','',72,'surfing',20,30),
 (45,2,'diamond','',73,'surfing',20,40),
@@ -6738 +6738 @@
 (47,2,'diamond','',22,'grass',53,53),
 (47,3,'diamond','',22,'grass',51,51),
-(47,2,'diamond','',22,'morning',0,0),
-(47,3,'diamond','',22,'morning',0,0),
+(47,2,'diamond','',22,'daytime',53,53),
+(47,3,'diamond','',22,'daytime',51,51),
 (47,6,'diamond','',55,'grass',53,53),
 (47,7,'diamond','',55,'grass',51,51),
@@ -6768 +6768 @@
 (47,0,'diamond','',130,'super-rod',30,40),
 (47,0,'diamond','',279,'surfing',40,55),
-(47,4,'diamond','',354,'night',0,0),
-(47,5,'diamond','',354,'night',0,0),
+(47,2,'diamond','',354,'night',53,53),
+(47,3,'diamond','',354,'night',51,51),
 (47,2,'diamond','',369,'super-rod',40,50),
 (48,5,'diamond','',43,'grass',18,18),
@@ -6775 +6775 @@
 (48,1,'diamond','',44,'grass',50,50),
 (48,2,'diamond','',55,'grass',52,52),
-(48,2,'diamond','',55,'morning',0,0),
-(48,4,'diamond','',55,'night',0,0),
+(48,2,'diamond','',55,'daytime',52,52),
+(48,2,'diamond','',55,'night',52,52),
 (48,4,'diamond','',69,'grass',18,18),
 (48,10,'diamond','',69,'grass',23,23),
@@ -6803 +6803 @@
 (48,2,'diamond','',224,'super-rod',40,55),
 (48,3,'diamond','',267,'grass',51,51),
-(48,3,'diamond','',267,'morning',0,0),
-(48,5,'diamond','',267,'night',0,0),
+(48,3,'diamond','',267,'daytime',51,51),
+(48,3,'diamond','',267,'night',51,51),
 (48,0,'diamond','',279,'surfing',40,55),
 (48,1,'diamond','',320,'super-rod',30,40),
@@ -6838 +6838 @@
 (49,3,'diamond','',278,'grass',29,29),
 (49,1,'diamond','',278,'surfing',20,30),
-(49,3,'diamond','',278,'morning',0,0),
-(49,5,'diamond','',278,'night',0,0),
+(49,3,'diamond','',278,'daytime',29,29),
+(49,3,'diamond','',278,'night',29,29),
 (49,3,'diamond','',279,'surfing',20,40),
 (49,4,'diamond','',279,'surfing',20,40),
@@ -6847 +6847 @@
 (49,9,'diamond','',304,'poketore',0,0),
 (49,2,'diamond','',403,'grass',28,28),
-(49,2,'diamond','',403,'morning',0,0),
-(49,4,'diamond','',403,'night',0,0),
+(49,2,'diamond','',403,'daytime',28,28),
+(49,2,'diamond','',403,'night',28,28),
 (49,4,'diamond','',404,'grass',29,29),
 (49,6,'diamond','',417,'grass',29,29),
@@ -6878 +6878 @@
 (50,9,'diamond','2F',35,'grass',37,37),
 (50,11,'diamond','2F',35,'grass',38,38),
-(50,3,'diamond','2F',35,'morning',0,0),
-(50,5,'diamond','2F',35,'night',0,0),
+(50,3,'diamond','2F',35,'daytime',36,36),
+(50,3,'diamond','2F',35,'night',36,36),
 (50,9,'diamond','2F',35,'poketore',0,0),
 (50,5,'diamond','2F',35,'ds-emerald',0,0),
@@ -6887 +6887 @@
 (50,7,'diamond','2F',42,'poketore',0,0),
 (50,2,'diamond','2F',67,'grass',37,37),
-(50,2,'diamond','2F',67,'morning',0,0),
-(50,4,'diamond','2F',67,'night',0,0),
+(50,2,'diamond','2F',67,'daytime',37,37),
+(50,2,'diamond','2F',67,'night',37,37),
 (50,1,'diamond','2F',75,'grass',36,36),
 (50,1,'diamond','2F',75,'swarm',0,0),
@@ -6910 +6910 @@
 (50,9,'diamond','3F',35,'grass',37,37),
 (50,11,'diamond','3F',35,'grass',38,38),
-(50,3,'diamond','3F',35,'morning',0,0),
-(50,5,'diamond','3F',35,'night',0,0),
+(50,3,'diamond','3F',35,'daytime',36,36),
+(50,3,'diamond','3F',35,'night',36,36),
 (50,9,'diamond','3F',35,'poketore',0,0),
 (50,5,'diamond','3F',35,'ds-emerald',0,0),
@@ -6919 +6919 @@
 (50,7,'diamond','3F',42,'poketore',0,0),
 (50,2,'diamond','3F',67,'grass',37,37),
-(50,2,'diamond','3F',67,'morning',0,0),
-(50,4,'diamond','3F',67,'night',0,0),
+(50,2,'diamond','3F',67,'daytime',37,37),
+(50,2,'diamond','3F',67,'night',37,37),
 (50,1,'diamond','3F',75,'grass',36,36),
 (50,1,'diamond','3F',75,'swarm',0,0),
@@ -6942 +6942 @@
 (50,9,'diamond','4F',35,'grass',39,39),
 (50,11,'diamond','4F',35,'grass',40,40),
-(50,3,'diamond','4F',35,'morning',0,0),
-(50,5,'diamond','4F',35,'night',0,0),
+(50,3,'diamond','4F',35,'daytime',38,38),
+(50,3,'diamond','4F',35,'night',38,38),
 (50,9,'diamond','4F',35,'poketore',0,0),
 (50,5,'diamond','4F',35,'ds-emerald',0,0),
@@ -6956 +6956 @@
 (50,7,'diamond','4F',42,'poketore',0,0),
 (50,2,'diamond','4F',67,'grass',39,39),
-(50,2,'diamond','4F',67,'morning',0,0),
-(50,4,'diamond','4F',67,'night',0,0),
+(50,2,'diamond','4F',67,'daytime',39,39),
+(50,2,'diamond','4F',67,'night',39,39),
 (50,1,'diamond','4F',75,'grass',38,38),
 (50,1,'diamond','4F',75,'swarm',0,0),
@@ -6994 +6994 @@
 (50,9,'diamond','5F',35,'grass',39,39),
 (50,11,'diamond','5F',35,'grass',40,40),
-(50,3,'diamond','5F',35,'morning',0,0),
-(50,5,'diamond','5F',35,'night',0,0),
+(50,3,'diamond','5F',35,'daytime',38,38),
+(50,3,'diamond','5F',35,'night',38,38),
 (50,9,'diamond','5F',35,'poketore',0,0),
 (50,5,'diamond','5F',35,'ds-emerald',0,0),
@@ -7003 +7003 @@
 (50,7,'diamond','5F',42,'poketore',0,0),
 (50,2,'diamond','5F',67,'grass',39,39),
-(50,2,'diamond','5F',67,'morning',0,0),
-(50,4,'diamond','5F',67,'night',0,0),
+(50,2,'diamond','5F',67,'daytime',39,39),
+(50,2,'diamond','5F',67,'night',39,39),
 (50,1,'diamond','5F',75,'grass',38,38),
 (50,1,'diamond','5F',75,'swarm',0,0),
@@ -7026 +7026 @@
 (50,9,'diamond','6F',35,'grass',41,41),
 (50,11,'diamond','6F',35,'grass',42,42),
-(50,3,'diamond','6F',35,'morning',0,0),
-(50,5,'diamond','6F',35,'night',0,0),
+(50,3,'diamond','6F',35,'daytime',40,40),
+(50,3,'diamond','6F',35,'night',40,40),
 (50,9,'diamond','6F',35,'poketore',0,0),
 (50,5,'diamond','6F',35,'ds-emerald',0,0),
@@ -7035 +7035 @@
 (50,7,'diamond','6F',42,'poketore',0,0),
 (50,2,'diamond','6F',67,'grass',41,41),
-(50,2,'diamond','6F',67,'morning',0,0),
-(50,4,'diamond','6F',67,'night',0,0),
+(50,2,'diamond','6F',67,'daytime',41,41),
+(50,2,'diamond','6F',67,'night',41,41),
 (50,1,'diamond','6F',75,'grass',40,40),
 (50,1,'diamond','6F',75,'swarm',0,0),
@@ -7058 +7058 @@
 (50,9,'diamond','7F',35,'grass',41,41),
 (50,11,'diamond','7F',35,'grass',42,42),
-(50,3,'diamond','7F',35,'morning',0,0),
-(50,5,'diamond','7F',35,'night',0,0),
+(50,3,'diamond','7F',35,'daytime',40,40),
+(50,3,'diamond','7F',35,'night',40,40),
 (50,9,'diamond','7F',35,'poketore',0,0),
 (50,5,'diamond','7F',35,'ds-emerald',0,0),
@@ -7067 +7067 @@
 (50,7,'diamond','7F',42,'poketore',0,0),
 (50,2,'diamond','7F',67,'grass',41,41),
-(50,2,'diamond','7F',67,'morning',0,0),
-(50,4,'diamond','7F',67,'night',0,0),
+(50,2,'diamond','7F',67,'daytime',41,41),
+(50,2,'diamond','7F',67,'night',41,41),
 (50,1,'diamond','7F',75,'grass',40,40),
 (50,1,'diamond','7F',75,'swarm',0,0),
@@ -7090 +7090 @@
 (50,9,'diamond','B1F',35,'grass',31,31),
 (50,11,'diamond','B1F',35,'grass',32,32),
-(50,2,'diamond','B1F',35,'morning',0,0),
-(50,4,'diamond','B1F',35,'night',0,0),
+(50,2,'diamond','B1F',35,'daytime',30,30),
+(50,2,'diamond','B1F',35,'night',30,30),
 (50,9,'diamond','B1F',35,'poketore',0,0),
 (50,1,'diamond','B1F',35,'ds-ruby',0,0),
@@ -7105 +7105 @@
 (50,3,'diamond','B1F',42,'surfing',30,40),
 (50,4,'diamond','B1F',42,'surfing',20,40),
-(50,3,'diamond','B1F',42,'morning',0,0),
-(50,5,'diamond','B1F',42,'night',0,0),
+(50,3,'diamond','B1F',42,'daytime',32,32),
+(50,3,'diamond','B1F',42,'night',32,32),
 (50,7,'diamond','B1F',42,'poketore',0,0),
 (50,4,'diamond','B1F',67,'grass',31,31),
@@ -7144 +7144 @@
 (50,7,'diamond','blizzard',35,'ds-firered',0,0),
 (50,9,'diamond','blizzard',35,'ds-leafgreen',0,0),
-(50,4,'diamond','blizzard',42,'night',0,0),
+(50,2,'diamond','blizzard',42,'night',39,39),
 (50,3,'diamond','blizzard',67,'grass',39,39),
 (50,5,'diamond','blizzard',67,'grass',40,40),
-(50,3,'diamond','blizzard',67,'morning',0,0),
-(50,5,'diamond','blizzard',164,'night',0,0),
+(50,3,'diamond','blizzard',67,'daytime',39,39),
+(50,3,'diamond','blizzard',164,'night',39,39),
 (50,6,'diamond','blizzard',294,'poketore',0,0),
 (50,7,'diamond','blizzard',294,'poketore',0,0),
@@ -7155 +7155 @@
 (50,2,'diamond','blizzard',308,'grass',39,39),
 (50,4,'diamond','blizzard',308,'grass',40,40),
-(50,2,'diamond','blizzard',308,'morning',0,0),
+(50,2,'diamond','blizzard',308,'daytime',39,39),
 (50,2,'diamond','blizzard',337,'ds-sapphire',0,0),
 (50,3,'diamond','blizzard',337,'ds-sapphire',0,0),
@@ -7174 +7174 @@
 (50,9,'diamond','cave',35,'grass',39,39),
 (50,11,'diamond','cave',35,'grass',40,40),
-(50,3,'diamond','cave',35,'morning',0,0),
-(50,5,'diamond','cave',35,'night',0,0),
+(50,3,'diamond','cave',35,'daytime',38,38),
+(50,3,'diamond','cave',35,'night',38,38),
 (50,9,'diamond','cave',35,'poketore',0,0),
 (50,5,'diamond','cave',35,'ds-emerald',0,0),
@@ -7183 +7183 @@
 (50,7,'diamond','cave',42,'poketore',0,0),
 (50,2,'diamond','cave',67,'grass',40,40),
-(50,2,'diamond','cave',67,'morning',0,0),
-(50,4,'diamond','cave',67,'night',0,0),
+(50,2,'diamond','cave',67,'daytime',40,40),
+(50,2,'diamond','cave',67,'night',40,40),
 (50,0,'diamond','cave',75,'grass',40,40),
 (50,1,'diamond','cave',75,'grass',39,39),
@@ -7206 +7206 @@
 (50,0,'diamond','Route 207',41,'surfing',20,30),
 (50,1,'diamond','Route 207',41,'surfing',20,40),
-(50,3,'diamond','Route 207',41,'morning',0,0),
-(50,5,'diamond','Route 207',41,'night',0,0),
+(50,3,'diamond','Route 207',41,'daytime',14,14),
+(50,3,'diamond','Route 207',41,'night',14,14),
 (50,7,'diamond','Route 207',41,'poketore',0,0),
 (50,2,'diamond','Route 207',42,'surfing',30,40),
@@ -7224 +7224 @@
 (50,1,'diamond','Route 207',74,'grass',15,15),
 (50,1,'diamond','Route 207',74,'swarm',0,0),
-(50,2,'diamond','Route 207',74,'morning',0,0),
-(50,4,'diamond','Route 207',74,'night',0,0),
+(50,2,'diamond','Route 207',74,'daytime',14,14),
+(50,2,'diamond','Route 207',74,'night',14,14),
 (50,0,'diamond','Route 207',129,'old-rod',4,6),
 (50,1,'diamond','Route 207',129,'old-rod',3,7),
@@ -7256 +7256 @@
 (50,7,'diamond','Route 207',433,'grass',15,15),
 (50,5,'diamond','Route 211',41,'grass',13,13),
-(50,3,'diamond','Route 211',41,'morning',0,0),
-(50,5,'diamond','Route 211',41,'night',0,0),
+(50,3,'diamond','Route 211',41,'daytime',12,12),
+(50,3,'diamond','Route 211',41,'night',12,12),
 (50,7,'diamond','Route 211',41,'poketore',0,0),
 (50,4,'diamond','Route 211',66,'grass',13,13),
@@ -7263 +7263 @@
 (50,1,'diamond','Route 211',74,'grass',13,13),
 (50,1,'diamond','Route 211',74,'swarm',0,0),
-(50,2,'diamond','Route 211',74,'morning',0,0),
-(50,4,'diamond','Route 211',74,'night',0,0),
+(50,2,'diamond','Route 211',74,'daytime',12,12),
+(50,2,'diamond','Route 211',74,'night',12,12),
 (50,2,'diamond','Route 211',173,'grass',12,12),
 (50,3,'diamond','Route 211',173,'grass',12,12),
@@ -7290 +7290 @@
 (50,9,'diamond','Route 216',35,'grass',31,31),
 (50,11,'diamond','Route 216',35,'grass',32,32),
-(50,2,'diamond','Route 216',35,'morning',0,0),
-(50,4,'diamond','Route 216',35,'night',0,0),
+(50,2,'diamond','Route 216',35,'daytime',30,30),
+(50,2,'diamond','Route 216',35,'night',30,30),
 (50,9,'diamond','Route 216',35,'poketore',0,0),
 (50,1,'diamond','Route 216',35,'ds-ruby',0,0),
@@ -7300 +7300 @@
 (50,3,'diamond','Route 216',42,'grass',32,32),
 (50,5,'diamond','Route 216',42,'grass',31,31),
-(50,3,'diamond','Route 216',42,'morning',0,0),
-(50,5,'diamond','Route 216',42,'night',0,0),
+(50,3,'diamond','Route 216',42,'daytime',32,32),
+(50,3,'diamond','Route 216',42,'night',32,32),
 (50,7,'diamond','Route 216',42,'poketore',0,0),
 (50,4,'diamond','Route 216',67,'grass',31,31),
@@ -7324 +7324 @@
 (50,7,'diamond','snowfall',35,'ds-firered',0,0),
 (50,9,'diamond','snowfall',35,'ds-leafgreen',0,0),
-(50,4,'diamond','snowfall',42,'night',0,0),
+(50,2,'diamond','snowfall',42,'night',39,39),
 (50,3,'diamond','snowfall',67,'grass',39,39),
 (50,5,'diamond','snowfall',67,'grass',40,40),
-(50,3,'diamond','snowfall',67,'morning',0,0),
-(50,5,'diamond','snowfall',164,'night',0,0),
+(50,3,'diamond','snowfall',67,'daytime',39,39),
+(50,3,'diamond','snowfall',164,'night',39,39),
 (50,6,'diamond','snowfall',294,'poketore',0,0),
 (50,7,'diamond','snowfall',294,'poketore',0,0),
@@ -7335 +7335 @@
 (50,2,'diamond','snowfall',308,'grass',39,39),
 (50,4,'diamond','snowfall',308,'grass',40,40),
-(50,2,'diamond','snowfall',308,'morning',0,0),
+(50,2,'diamond','snowfall',308,'daytime',39,39),
 (50,2,'diamond','snowfall',337,'ds-sapphire',0,0),
 (50,3,'diamond','snowfall',337,'ds-sapphire',0,0),
@@ -7354 +7354 @@
 (51,6,'diamond','1F',42,'grass',46,46),
 (51,7,'diamond','1F',42,'grass',44,44),
-(51,3,'diamond','1F',42,'morning',0,0),
-(51,5,'diamond','1F',42,'night',0,0),
+(51,3,'diamond','1F',42,'daytime',45,45),
+(51,3,'diamond','1F',42,'night',45,45),
 (51,0,'diamond','1F',67,'grass',45,45),
 (51,8,'diamond','1F',67,'grass',46,46),
@@ -7375 +7375 @@
 (51,9,'diamond','1F',308,'grass',46,46),
 (51,11,'diamond','1F',308,'grass',44,44),
-(51,2,'diamond','1F',308,'morning',0,0),
-(51,4,'diamond','1F',308,'night',0,0),
+(51,2,'diamond','1F',308,'daytime',45,45),
+(51,2,'diamond','1F',308,'night',45,45),
 (51,9,'diamond','1F',308,'poketore',0,0),
 (51,1,'diamond','1F',308,'ds-ruby',0,0),
@@ -7386 +7386 @@
 (51,6,'diamond','2F',42,'grass',47,47),
 (51,7,'diamond','2F',42,'grass',45,45),
-(51,3,'diamond','2F',42,'morning',0,0),
-(51,5,'diamond','2F',42,'night',0,0),
+(51,3,'diamond','2F',42,'daytime',46,46),
+(51,3,'diamond','2F',42,'night',46,46),
 (51,0,'diamond','2F',64,'grass',46,46),
 (51,8,'diamond','2F',64,'grass',47,47),
@@ -7407 +7407 @@
 (51,9,'diamond','2F',308,'grass',47,47),
 (51,11,'diamond','2F',308,'grass',45,45),
-(51,2,'diamond','2F',308,'morning',0,0),
-(51,4,'diamond','2F',308,'night',0,0),
+(51,2,'diamond','2F',308,'daytime',46,46),
+(51,2,'diamond','2F',308,'night',46,46),
 (51,9,'diamond','2F',308,'poketore',0,0),
 (51,1,'diamond','2F',308,'ds-ruby',0,0),
@@ -7423 +7423 @@
 (51,3,'diamond','B1F',42,'surfing',40,50),
 (51,4,'diamond','B1F',42,'surfing',40,50),
-(51,3,'diamond','B1F',42,'morning',0,0),
-(51,5,'diamond','B1F',42,'night',0,0),
+(51,3,'diamond','B1F',42,'daytime',45,45),
+(51,3,'diamond','B1F',42,'night',45,45),
 (51,0,'diamond','B1F',67,'grass',45,45),
 (51,8,'diamond','B1F',67,'grass',46,46),
@@ -7455 +7455 @@
 (51,9,'diamond','B1F',308,'grass',46,46),
 (51,11,'diamond','B1F',308,'grass',44,44),
-(51,2,'diamond','B1F',308,'morning',0,0),
-(51,4,'diamond','B1F',308,'night',0,0),
+(51,2,'diamond','B1F',308,'daytime',45,45),
+(51,2,'diamond','B1F',308,'night',45,45),
 (51,9,'diamond','B1F',308,'poketore',0,0),
 (51,1,'diamond','B1F',308,'ds-ruby',0,0),
@@ -7470 +7470 @@
 (51,6,'diamond','inside',42,'grass',52,52),
 (51,7,'diamond','inside',42,'grass',50,50),
-(51,3,'diamond','inside',42,'morning',0,0),
-(51,5,'diamond','inside',42,'night',0,0),
+(51,3,'diamond','inside',42,'daytime',51,51),
+(51,3,'diamond','inside',42,'night',51,51),
 (51,0,'diamond','inside',67,'grass',51,51),
 (51,8,'diamond','inside',67,'grass',52,52),
@@ -7491 +7491 @@
 (51,9,'diamond','inside',308,'grass',52,52),
 (51,11,'diamond','inside',308,'grass',50,50),
-(51,2,'diamond','inside',308,'morning',0,0),
-(51,4,'diamond','inside',308,'night',0,0),
+(51,2,'diamond','inside',308,'daytime',51,51),
+(51,2,'diamond','inside',308,'night',51,51),
 (51,9,'diamond','inside',308,'poketore',0,0),
 (51,1,'diamond','inside',308,'ds-ruby',0,0),
@@ -7504 +7504 @@
 (51,0,'diamond','inside B1F',42,'surfing',40,50),
 (51,1,'diamond','inside B1F',42,'surfing',45,55),
-(51,3,'diamond','inside B1F',42,'morning',0,0),
-(51,5,'diamond','inside B1F',42,'night',0,0),
+(51,3,'diamond','inside B1F',42,'daytime',51,51),
+(51,3,'diamond','inside B1F',42,'night',51,51),
 (51,0,'diamond','inside B1F',67,'grass',51,51),
 (51,8,'diamond','inside B1F',67,'grass',52,52),
@@ -7539 +7539 @@
 (51,9,'diamond','inside B1F',308,'grass',52,52),
 (51,11,'diamond','inside B1F',308,'grass',50,50),
-(51,2,'diamond','inside B1F',308,'morning',0,0),
-(51,4,'diamond','inside B1F',308,'night',0,0),
+(51,2,'diamond','inside B1F',308,'daytime',51,51),
+(51,2,'diamond','inside B1F',308,'night',51,51),
 (51,9,'diamond','inside B1F',308,'poketore',0,0),
 (51,1,'diamond','inside B1F',308,'ds-ruby',0,0),
@@ -7554 +7554 @@
 (51,6,'diamond','inside exit',42,'grass',52,52),
 (51,7,'diamond','inside exit',42,'grass',50,50),
-(51,3,'diamond','inside exit',42,'morning',0,0),
-(51,5,'diamond','inside exit',42,'night',0,0),
+(51,3,'diamond','inside exit',42,'daytime',51,51),
+(51,3,'diamond','inside exit',42,'night',51,51),
 (51,0,'diamond','inside exit',67,'grass',51,51),
 (51,8,'diamond','inside exit',67,'grass',52,52),
@@ -7575 +7575 @@
 (51,9,'diamond','inside exit',308,'grass',52,52),
 (51,11,'diamond','inside exit',308,'grass',50,50),
-(51,2,'diamond','inside exit',308,'morning',0,0),
-(51,4,'diamond','inside exit',308,'night',0,0),
+(51,2,'diamond','inside exit',308,'daytime',51,51),
+(51,2,'diamond','inside exit',308,'night',51,51),
 (51,9,'diamond','inside exit',308,'poketore',0,0),
 (51,1,'diamond','inside exit',308,'ds-ruby',0,0),
@@ -7616 +7616 @@
 (52,2,'diamond','',74,'grass',5,5),
 (52,3,'diamond','',74,'grass',5,5),
-(52,2,'diamond','',74,'morning',0,0),
-(52,3,'diamond','',74,'morning',0,0),
-(52,4,'diamond','',74,'night',0,0),
-(52,5,'diamond','',74,'night',0,0),
+(52,2,'diamond','',74,'daytime',5,5),
+(52,3,'diamond','',74,'daytime',5,5),
+(52,2,'diamond','',74,'night',5,5),
+(52,3,'diamond','',74,'night',5,5),
 (52,0,'diamond','',129,'old-rod',4,6),
 (52,1,'diamond','',129,'old-rod',3,7),
@@ -7640 +7640 @@
 (53,0,'diamond','',54,'surfing',20,30),
 (53,1,'diamond','',54,'surfing',20,40),
-(53,3,'diamond','',54,'morning',0,0),
+(53,3,'diamond','',54,'daytime',36,36),
 (53,2,'diamond','',55,'surfing',30,40),
 (53,3,'diamond','',55,'surfing',30,40),
@@ -7659 +7659 @@
 (53,0,'diamond','',130,'super-rod',30,40),
 (53,2,'diamond','',130,'super-rod',40,55),
-(53,4,'diamond','',164,'night',0,0),
-(53,5,'diamond','',164,'night',0,0),
+(53,2,'diamond','',164,'night',34,34),
+(53,3,'diamond','',164,'night',36,36),
 (53,6,'diamond','',202,'poketore',0,0),
 (53,7,'diamond','',202,'poketore',0,0),
@@ -7682 +7682 @@
 (53,8,'diamond','',400,'grass',34,34),
 (53,10,'diamond','',400,'grass',34,34),
-(53,2,'diamond','',400,'morning',0,0),
+(53,2,'diamond','',400,'daytime',34,34),
 (53,6,'diamond','',400,'ds-firered',0,0),
 (53,8,'diamond','',400,'ds-leafgreen',0,0),
@@ -7699 +7699 @@
 (54,0,'diamond','',74,'swarm',0,0),
 (54,1,'diamond','',74,'swarm',0,0),
-(54,2,'diamond','',74,'morning',0,0),
-(54,3,'diamond','',74,'morning',0,0),
-(54,4,'diamond','',74,'night',0,0),
-(54,5,'diamond','',74,'night',0,0),
+(54,2,'diamond','',74,'daytime',22,22),
+(54,3,'diamond','',74,'daytime',22,22),
+(54,2,'diamond','',74,'night',22,22),
+(54,3,'diamond','',74,'night',22,22),
 (54,6,'diamond','',74,'poketore',0,0),
 (54,7,'diamond','',74,'poketore',0,0),
@@ -7730 +7730 @@
 (54,0,'diamond','expansion',74,'swarm',0,0),
 (54,1,'diamond','expansion',74,'swarm',0,0),
-(54,2,'diamond','expansion',74,'morning',0,0),
-(54,3,'diamond','expansion',74,'morning',0,0),
-(54,4,'diamond','expansion',74,'night',0,0),
-(54,5,'diamond','expansion',74,'night',0,0),
+(54,2,'diamond','expansion',74,'daytime',23,23),
+(54,3,'diamond','expansion',74,'daytime',23,23),
+(54,2,'diamond','expansion',74,'night',23,23),
+(54,3,'diamond','expansion',74,'night',23,23),
 (54,6,'diamond','expansion',74,'poketore',0,0),
 (54,7,'diamond','expansion',74,'poketore',0,0),
@@ -7772 +7772 @@
 (55,4,'diamond','',457,'super-rod',20,50),
 (55,2,'diamond','1F',41,'grass',30,30),
-(55,2,'diamond','1F',41,'morning',0,0),
-(55,4,'diamond','1F',41,'night',0,0),
+(55,2,'diamond','1F',41,'daytime',30,30),
+(55,2,'diamond','1F',41,'night',30,30),
 (55,3,'diamond','1F',42,'grass',31,31),
-(55,3,'diamond','1F',42,'morning',0,0),
-(55,5,'diamond','1F',42,'night',0,0),
+(55,3,'diamond','1F',42,'daytime',31,31),
+(55,3,'diamond','1F',42,'night',31,31),
 (55,0,'diamond','1F',74,'grass',30,30),
 (55,4,'diamond','1F',74,'grass',29,29),
@@ -7805 +7805 @@
 (55,2,'diamond','B1F left',42,'grass',30,30),
 (55,3,'diamond','B1F left',42,'grass',31,31),
-(55,2,'diamond','B1F left',42,'morning',0,0),
-(55,3,'diamond','B1F left',42,'morning',0,0),
-(55,4,'diamond','B1F left',42,'night',0,0),
-(55,5,'diamond','B1F left',42,'night',0,0),
+(55,2,'diamond','B1F left',42,'daytime',30,30),
+(55,3,'diamond','B1F left',42,'daytime',31,31),
+(55,2,'diamond','B1F left',42,'night',30,30),
+(55,3,'diamond','B1F left',42,'night',31,31),
 (55,10,'diamond','B1F left',74,'grass',31,31),
 (55,8,'diamond','B1F left',74,'poketore',0,0),
@@ -7837 +7837 @@
 (55,2,'diamond','B1F right',42,'grass',30,30),
 (55,3,'diamond','B1F right',42,'grass',31,31),
-(55,2,'diamond','B1F right',42,'morning',0,0),
-(55,3,'diamond','B1F right',42,'morning',0,0),
-(55,4,'diamond','B1F right',42,'night',0,0),
-(55,5,'diamond','B1F right',42,'night',0,0),
+(55,2,'diamond','B1F right',42,'daytime',30,30),
+(55,3,'diamond','B1F right',42,'daytime',31,31),
+(55,2,'diamond','B1F right',42,'night',30,30),
+(55,3,'diamond','B1F right',42,'night',31,31),
 (55,10,'diamond','B1F right',74,'grass',31,31),
 (55,8,'diamond','B1F right',74,'poketore',0,0),
@@ -7869 +7869 @@
 (55,2,'diamond','B2F left',42,'grass',31,31),
 (55,3,'diamond','B2F left',42,'grass',32,32),
-(55,2,'diamond','B2F left',42,'morning',0,0),
-(55,3,'diamond','B2F left',42,'morning',0,0),
-(55,4,'diamond','B2F left',42,'night',0,0),
-(55,5,'diamond','B2F left',42,'night',0,0),
+(55,2,'diamond','B2F left',42,'daytime',31,31),
+(55,3,'diamond','B2F left',42,'daytime',32,32),
+(55,2,'diamond','B2F left',42,'night',31,31),
+(55,3,'diamond','B2F left',42,'night',32,32),
 (55,10,'diamond','B2F left',74,'grass',32,32),
 (55,8,'diamond','B2F left',74,'poketore',0,0),
@@ -7901 +7901 @@
 (55,2,'diamond','B2F right',42,'grass',30,30),
 (55,3,'diamond','B2F right',42,'grass',31,31),
-(55,2,'diamond','B2F right',42,'morning',0,0),
-(55,3,'diamond','B2F right',42,'morning',0,0),
-(55,4,'diamond','B2F right',42,'night',0,0),
-(55,5,'diamond','B2F right',42,'night',0,0),
+(55,2,'diamond','B2F right',42,'daytime',30,30),
+(55,3,'diamond','B2F right',42,'daytime',31,31),
+(55,2,'diamond','B2F right',42,'night',30,30),
+(55,3,'diamond','B2F right',42,'night',31,31),
 (55,10,'diamond','B2F right',74,'grass',31,31),
 (55,8,'diamond','B2F right',74,'poketore',0,0),
@@ -7933 +7933 @@
 (55,2,'diamond','B3F',42,'grass',31,31),
 (55,3,'diamond','B3F',42,'grass',32,32),
-(55,2,'diamond','B3F',42,'morning',0,0),
-(55,3,'diamond','B3F',42,'morning',0,0),
-(55,4,'diamond','B3F',42,'night',0,0),
-(55,5,'diamond','B3F',42,'night',0,0),
+(55,2,'diamond','B3F',42,'daytime',31,31),
+(55,3,'diamond','B3F',42,'daytime',32,32),
+(55,2,'diamond','B3F',42,'night',31,31),
+(55,3,'diamond','B3F',42,'night',32,32),
 (55,10,'diamond','B3F',74,'grass',32,32),
 (55,8,'diamond','B3F',74,'poketore',0,0),
@@ -7973 +7973 @@
 (56,0,'diamond','',74,'swarm',0,0),
 (56,1,'diamond','',74,'swarm',0,0),
-(56,2,'diamond','',74,'morning',0,0),
-(56,3,'diamond','',74,'morning',0,0),
-(56,4,'diamond','',74,'night',0,0),
-(56,5,'diamond','',74,'night',0,0),
+(56,2,'diamond','',74,'daytime',24,24),
+(56,3,'diamond','',74,'daytime',24,24),
+(56,2,'diamond','',74,'night',24,24),
+(56,3,'diamond','',74,'night',24,24),
 (56,6,'diamond','',74,'poketore',0,0),
 (56,8,'diamond','',74,'poketore',0,0),
@@ -8009 +8009 @@
 (57,0,'diamond','2F',92,'swarm',0,0),
 (57,1,'diamond','2F',92,'swarm',0,0),
-(57,2,'diamond','2F',92,'morning',0,0),
-(57,3,'diamond','2F',92,'morning',0,0),
-(57,4,'diamond','2F',92,'night',0,0),
-(57,5,'diamond','2F',92,'night',0,0),
+(57,2,'diamond','2F',92,'daytime',14,14),
+(57,3,'diamond','2F',92,'daytime',14,14),
+(57,2,'diamond','2F',92,'night',14,14),
+(57,3,'diamond','2F',92,'night',14,14),
 (57,6,'diamond','2F',92,'poketore',0,0),
 (57,7,'diamond','2F',92,'poketore',0,0),
@@ -8041 +8041 @@
 (57,0,'diamond','2F left room',92,'swarm',0,0),
 (57,1,'diamond','2F left room',92,'swarm',0,0),
-(57,2,'diamond','2F left room',92,'morning',0,0),
-(57,3,'diamond','2F left room',92,'morning',0,0),
-(57,4,'diamond','2F left room',92,'night',0,0),
-(57,5,'diamond','2F left room',92,'night',0,0),
+(57,2,'diamond','2F left room',92,'daytime',14,14),
+(57,3,'diamond','2F left room',92,'daytime',14,14),
+(57,2,'diamond','2F left room',92,'night',14,14),
+(57,3,'diamond','2F left room',92,'night',14,14),
 (57,6,'diamond','2F left room',92,'poketore',0,0),
 (57,7,'diamond','2F left room',92,'poketore',0,0),
@@ -8073 +8073 @@
 (57,0,'diamond','2F leftmost room',92,'swarm',0,0),
 (57,1,'diamond','2F leftmost room',92,'swarm',0,0),
-(57,2,'diamond','2F leftmost room',92,'morning',0,0),
-(57,3,'diamond','2F leftmost room',92,'morning',0,0),
-(57,4,'diamond','2F leftmost room',92,'night',0,0),
-(57,5,'diamond','2F leftmost room',92,'night',0,0),
+(57,2,'diamond','2F leftmost room',92,'daytime',14,14),
+(57,3,'diamond','2F leftmost room',92,'daytime',14,14),
+(57,2,'diamond','2F leftmost room',92,'night',14,14),
+(57,3,'diamond','2F leftmost room',92,'night',14,14),
 (57,6,'diamond','2F leftmost room',92,'poketore',0,0),
 (57,7,'diamond','2F leftmost room',92,'poketore',0,0),
@@ -8105 +8105 @@
 (57,0,'diamond','2F middle room',92,'swarm',0,0),
 (57,1,'diamond','2F middle room',92,'swarm',0,0),
-(57,2,'diamond','2F middle room',92,'morning',0,0),
-(57,3,'diamond','2F middle room',92,'morning',0,0),
-(57,4,'diamond','2F middle room',92,'night',0,0),
-(57,5,'diamond','2F middle room',92,'night',0,0),
+(57,2,'diamond','2F middle room',92,'daytime',14,14),
+(57,3,'diamond','2F middle room',92,'daytime',14,14),
+(57,2,'diamond','2F middle room',92,'night',14,14),
+(57,3,'diamond','2F middle room',92,'night',14,14),
 (57,6,'diamond','2F middle room',92,'poketore',0,0),
 (57,7,'diamond','2F middle room',92,'poketore',0,0),
@@ -8137 +8137 @@
 (57,0,'diamond','2F private room',92,'swarm',0,0),
 (57,1,'diamond','2F private room',92,'swarm',0,0),
-(57,2,'diamond','2F private room',92,'morning',0,0),
-(57,3,'diamond','2F private room',92,'morning',0,0),
-(57,4,'diamond','2F private room',92,'night',0,0),
-(57,5,'diamond','2F private room',92,'night',0,0),
+(57,2,'diamond','2F private room',92,'daytime',14,14),
+(57,3,'diamond','2F private room',92,'daytime',14,14),
+(57,2,'diamond','2F private room',92,'night',14,14),
+(57,3,'diamond','2F private room',92,'night',14,14),
 (57,6,'diamond','2F private room',92,'poketore',0,0),
 (57,7,'diamond','2F private room',92,'poketore',0,0),
@@ -8169 +8169 @@
 (57,0,'diamond','2F right room',92,'swarm',0,0),
 (57,1,'diamond','2F right room',92,'swarm',0,0),
-(57,2,'diamond','2F right room',92,'morning',0,0),
-(57,3,'diamond','2F right room',92,'morning',0,0),
-(57,4,'diamond','2F right room',92,'night',0,0),
-(57,5,'diamond','2F right room',92,'night',0,0),
+(57,2,'diamond','2F right room',92,'daytime',14,14),
+(57,3,'diamond','2F right room',92,'daytime',14,14),
+(57,2,'diamond','2F right room',92,'night',14,14),
+(57,3,'diamond','2F right room',92,'night',14,14),
 (57,6,'diamond','2F right room',92,'poketore',0,0),
 (57,7,'diamond','2F right room',92,'poketore',0,0),
@@ -8201 +8201 @@
 (57,0,'diamond','2F rightmost room',92,'swarm',0,0),
 (57,1,'diamond','2F rightmost room',92,'swarm',0,0),
-(57,2,'diamond','2F rightmost room',92,'morning',0,0),
-(57,3,'diamond','2F rightmost room',92,'morning',0,0),
-(57,4,'diamond','2F rightmost room',92,'night',0,0),
-(57,5,'diamond','2F rightmost room',92,'night',0,0),
+(57,2,'diamond','2F rightmost room',92,'daytime',14,14),
+(57,3,'diamond','2F rightmost room',92,'daytime',14,14),
+(57,2,'diamond','2F rightmost room',92,'night',14,14),
+(57,3,'diamond','2F rightmost room',92,'night',14,14),
 (57,6,'diamond','2F rightmost room',92,'poketore',0,0),
 (57,7,'diamond','2F rightmost room',92,'poketore',0,0),
@@ -8233 +8233 @@
 (57,0,'diamond','dining room',92,'swarm',0,0),
 (57,1,'diamond','dining room',92,'swarm',0,0),
-(57,2,'diamond','dining room',92,'morning',0,0),
-(57,3,'diamond','dining room',92,'morning',0,0),
-(57,4,'diamond','dining room',92,'night',0,0),
-(57,5,'diamond','dining room',92,'night',0,0),
+(57,2,'diamond','dining room',92,'daytime',14,14),
+(57,3,'diamond','dining room',92,'daytime',14,14),
+(57,2,'diamond','dining room',92,'night',14,14),
+(57,3,'diamond','dining room',92,'night',14,14),
 (57,6,'diamond','dining room',92,'poketore',0,0),
 (57,7,'diamond','dining room',92,'poketore',0,0),
@@ -8265 +8265 @@
 (57,0,'diamond','entrance',92,'swarm',0,0),
 (57,1,'diamond','entrance',92,'swarm',0,0),
-(57,2,'diamond','entrance',92,'morning',0,0),
-(57,3,'diamond','entrance',92,'morning',0,0),
-(57,4,'diamond','entrance',92,'night',0,0),
-(57,5,'diamond','entrance',92,'night',0,0),
+(57,2,'diamond','entrance',92,'daytime',14,14),
+(57,3,'diamond','entrance',92,'daytime',14,14),
+(57,2,'diamond','entrance',92,'night',14,14),
+(57,3,'diamond','entrance',92,'night',14,14),
 (57,6,'diamond','entrance',92,'poketore',0,0),
 (57,7,'diamond','entrance',92,'poketore',0,0),
@@ -8283 +8283 @@
 (57,8,'diamond','entrance',93,'ds-leafgreen',0,0),
 (57,9,'diamond','entrance',93,'ds-leafgreen',0,0),
-(58,4,'diamond','',41,'night',0,0),
+(58,2,'diamond','',41,'night',35,35),
 (58,3,'diamond','',67,'grass',35,35),
 (58,5,'diamond','',67,'grass',36,36),
-(58,3,'diamond','',67,'morning',0,0),
-(58,5,'diamond','',164,'night',0,0),
+(58,3,'diamond','',67,'daytime',35,35),
+(58,3,'diamond','',164,'night',35,35),
 (58,1,'diamond','',215,'grass',34,34),
 (58,7,'diamond','',215,'grass',35,35),
@@ -8294 +8294 @@
 (58,5,'diamond','',216,'ds-emerald',0,0),
 (58,2,'diamond','',307,'grass',35,35),
-(58,2,'diamond','',307,'morning',0,0),
+(58,2,'diamond','',307,'daytime',35,35),
 (58,4,'diamond','',308,'grass',35,35),
 (58,8,'diamond','',308,'grass',36,36),
@@ -8324 +8324 @@
 (59,9,'diamond','',75,'grass',22,22),
 (59,11,'diamond','',75,'grass',22,22),
-(59,3,'diamond','',75,'morning',0,0),
+(59,3,'diamond','',75,'daytime',21,21),
 (59,1,'diamond','',75,'ds-ruby',0,0),
 (59,3,'diamond','',75,'ds-sapphire',0,0),
@@ -8335 +8335 @@
 (59,2,'diamond','',397,'grass',21,21),
 (59,7,'diamond','',397,'grass',22,22),
-(59,2,'diamond','',397,'morning',0,0),
+(59,2,'diamond','',397,'daytime',21,21),
 (59,4,'diamond','',400,'grass',21,21),
 (59,8,'diamond','',400,'grass',22,22),
@@ -8345 +8345 @@
 (59,8,'diamond','',400,'ds-leafgreen',0,0),
 (59,6,'diamond','',402,'grass',22,22),
-(59,4,'diamond','',402,'night',0,0),
-(59,5,'diamond','',402,'night',0,0),
+(59,2,'diamond','',402,'night',21,21),
+(59,3,'diamond','',402,'night',21,21),
 (60,4,'diamond','',55,'grass',53,53),
 (60,5,'diamond','',55,'grass',54,54),
@@ -8371 +8371 @@
 (60,0,'diamond','',130,'super-rod',30,40),
 (60,2,'diamond','',130,'super-rod',40,55),
-(60,4,'diamond','',164,'night',0,0),
-(60,5,'diamond','',164,'night',0,0),
+(60,2,'diamond','',164,'night',53,53),
+(60,3,'diamond','',164,'night',54,54),
 (60,2,'diamond','',337,'ds-sapphire',0,0),
 (60,3,'diamond','',337,'ds-sapphire',0,0),
@@ -8383 +8383 @@
 (60,9,'diamond','',397,'grass',52,52),
 (60,11,'diamond','',397,'grass',52,52),
-(60,2,'diamond','',397,'morning',0,0),
-(60,3,'diamond','',397,'morning',0,0),
+(60,2,'diamond','',397,'daytime',53,53),
+(60,3,'diamond','',397,'daytime',54,54),
 (60,9,'diamond','',397,'poketore',0,0),
 (60,5,'diamond','',397,'ds-emerald',0,0),
@@ -8425 +8425 @@
 (61,0,'diamond','',397,'grass',17,17),
 (61,0,'diamond','',397,'swarm',0,0),
-(61,2,'diamond','',397,'morning',0,0),
-(61,3,'diamond','',397,'morning',0,0),
+(61,2,'diamond','',397,'daytime',16,16),
+(61,3,'diamond','',397,'daytime',16,16),
 (61,5,'diamond','',402,'grass',17,17),
-(61,4,'diamond','',402,'night',0,0),
-(61,5,'diamond','',402,'night',0,0),
+(61,2,'diamond','',402,'night',16,16),
+(61,3,'diamond','',402,'night',16,16),
 (61,7,'diamond','',402,'poketore',0,0),
 (62,4,'diamond','',54,'grass',35,35),
@@ -8455 +8455 @@
 (62,0,'diamond','',130,'super-rod',30,40),
 (62,2,'diamond','',130,'super-rod',40,55),
-(62,4,'diamond','',164,'night',0,0),
-(62,5,'diamond','',164,'night',0,0),
+(62,2,'diamond','',164,'night',34,34),
+(62,3,'diamond','',164,'night',36,36),
 (62,6,'diamond','',202,'poketore',0,0),
 (62,7,'diamond','',202,'poketore',0,0),
@@ -8469 +8469 @@
 (62,9,'diamond','',397,'grass',35,35),
 (62,11,'diamond','',397,'grass',35,35),
-(62,2,'diamond','',397,'morning',0,0),
-(62,3,'diamond','',397,'morning',0,0),
+(62,2,'diamond','',397,'daytime',34,34),
+(62,3,'diamond','',397,'daytime',36,36),
 (62,5,'diamond','',397,'ds-emerald',0,0),
 (62,7,'diamond','',397,'ds-firered',0,0),
@@ -8519 +8519 @@
 (63,8,'diamond','after',396,'grass',4,4),
 (63,10,'diamond','after',396,'grass',4,4),
-(63,2,'diamond','after',396,'morning',0,0),
+(63,2,'diamond','after',396,'daytime',3,3),
 (63,5,'diamond','after',397,'ds-emerald',0,0),
 (63,7,'diamond','after',397,'ds-firered',0,0),
@@ -8529 +8529 @@
 (63,9,'diamond','after',399,'grass',4,4),
 (63,11,'diamond','after',399,'grass',4,4),
-(63,3,'diamond','after',399,'morning',0,0),
-(63,4,'diamond','after',399,'night',0,0),
-(63,5,'diamond','after',399,'night',0,0),
+(63,3,'diamond','after',399,'daytime',3,3),
+(63,2,'diamond','after',399,'night',3,3),
+(63,3,'diamond','after',399,'night',3,3),
 (63,4,'diamond','after',400,'ds-emerald',0,0),
 (63,6,'diamond','after',400,'ds-firered',0,0),
@@ -8571 +8571 @@
 (63,8,'diamond','before',396,'grass',4,4),
 (63,10,'diamond','before',396,'grass',4,4),
-(63,2,'diamond','before',396,'morning',0,0),
+(63,2,'diamond','before',396,'daytime',3,3),
 (63,5,'diamond','before',397,'ds-emerald',0,0),
 (63,7,'diamond','before',397,'ds-firered',0,0),
@@ -8581 +8581 @@
 (63,9,'diamond','before',399,'grass',4,4),
 (63,11,'diamond','before',399,'grass',4,4),
-(63,3,'diamond','before',399,'morning',0,0),
-(63,4,'diamond','before',399,'night',0,0),
-(63,5,'diamond','before',399,'night',0,0),
+(63,3,'diamond','before',399,'daytime',3,3),
+(63,2,'diamond','before',399,'night',3,3),
+(63,3,'diamond','before',399,'night',3,3),
 (63,4,'diamond','before',400,'ds-emerald',0,0),
 (63,6,'diamond','before',400,'ds-firered',0,0),
@@ -8911 +8911 @@
   coneffect tinyint(4) NOT NULL default '0',
   notes text,
+  newflags char(13) default NULL,
   PRIMARY KEY  (id)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;

veekun/branches/layout/templates/dex/common.tt

@@ -5 +5 @@
 
 [% move_header = BLOCK %]
- <th class="name"> Move </th> <th class="type"> Type </th> <th class="class"> Dmg </th> <th class="pp"> PP </th>
+ <th class="name"> Move </th> <th class="type"> Type </th> <th class="type"> Dmg </th> <th class="pp"> PP </th>
  <th class="power"> Power </th> <th class="acc"> Acc. </th> <th class="blurb"> Description </th>
 [% END %]
@@ -25 +25 @@
  <td class="type"><img src="/dex-images/gameui/iiam.png" alt="?????" title="?????"/></td>
 [%     ELSE %]
- <td class="type[% IF preferred_types.size AND preferred_types.${MoveData.$moveid.type} AND MoveData.$moveid.power > 0; ' preferred'; END %]">[% type_name(type) %] </td>
+ <td class="type">[% type_name(type) %]</td>
 [%     END %]
- <td class="class[% IF preferred_damage AND MoveData.$moveid.class == preferred_damage AND MoveData.$moveid.power > 0; ' preferred'; END %]"> <img src="/dex-images/gameui/[% MoveData.$moveid.class %].png" alt="[% MoveData.$moveid.class %]" title="[% MoveData.$moveid.class %]"/> </td>
+ <td class="type"> <img src="/dex-images/gameui/[% MoveData.$moveid.class %].png" alt="[% MoveData.$moveid.class %]" title="[% MoveData.$moveid.class %]"/> </td>
  <td class="pp"> [% MoveData.$moveid.pp %] </td> <td class="power"> [% power %] </td> <td class="acc"> [% MoveData.$moveid.acc %]%</td> <td class="blurb"> [% MoveData.$moveid.blurb %] </td>
 [%+ END %]

veekun/branches/layout/templates/dex/page/pokemon.tt

@@ -317 +317 @@
 <h1>Locations</h1>
 <p> <a href="[% dex_uri('pokemon', this.name) %]/map[%# TODO %]"><img src="/images/see-also.png" alt="See also:"/> Location map</a> </p>
-<table cellspacing="0" cellpadding="3" class="dex dex-locations">
-<tr>
-    <th>Area</th> <th>Section</th>
-    <th>Grass</th> <th>Surfing</th>
-    <th><img src="/dex-images/items/old-rod.png" alt="Old Rod" title="Old Rod"/></th>  <!--th>Fishing</th-->
-    <th><img src="/dex-images/items/good-rod.png" alt="Good Rod" title="Good Rod"/></th>  <!--th>Fishing</th-->
-    <th><img src="/dex-images/items/super-rod.png" alt="Super Rod" title="Super Rod"/></th>  <!--th>Fishing</th-->
-    <th>Swarm</th> <th>Morn</th><th>Night</th> <th>Pok&eacute;tore</th> <th colspan="5">Dual Slot</th>
-    [%# use colspans, so one col for everybody %]
-</tr>
+<table cellspacing="0" cellpadding="3" class="dex-table dex-locations">
+[% grass_columns = (location_columns.grass   || 0)
+                 + (location_columns.daytime || 0)
+                 + (location_columns.night   || 0) %]
+[% fish_columns = (location_columns.${'old-rod'}   || 0)
+                + (location_columns.${'good-rod'}  || 0)
+                + (location_columns.${'super-rod'} || 0) %]
+[% rowspan = ' rowspan="2"' IF grass_columns OR fish_columns %]
+<tr class="heading">
+    <th[% rowspan %]>Area</th>
+[% IF location_columns.section %]
+    <th[% rowspan %]>Section</th>
+[% END %]
+[% IF grass_columns %]
+    <th colspan="[% grass_columns %]">Grass</th>
+[% END %]
+[% IF location_columns.surfing %]
+    <th[% rowspan %]>Surfing</th>
+[% END %]
+[% IF fish_columns %]
+    <th colspan="[% fish_columns %]">Fishing</th>
+[% END %]
+[% IF location_columns.swarm %]
+    <th[% rowspan %]>Swarm</th>
+[% END %]
+[% IF location_columns.poketore %]
+    <th[% rowspan %]>Pok&eacute;radar</th>
+[% END %]
+[% IF location_columns.dualslot %]
+    <th[% rowspan %] colspan="5">Dual Slot</th>
+[% END %]
+</tr>
+[% IF grass_columns OR fish_columns %]
+<tr class="heading">
+[% IF location_columns.grass %]
+    <th>Morn</th>
+[% END %]
+[% IF location_columns.daytime %]
+    <th>Day</th>
+[% END %]
+[% IF location_columns.night %]
+    <th>Night</th>
+[% END %]
+[% IF location_columns.${'old-rod'} %]
+    <th><img src="/dex-images/items/old-rod.png" alt="Old Rod" title="Old Rod"/></th>
+[% END %]
+[% IF location_columns.${'good-rod'} %]
+    <th><img src="/dex-images/items/good-rod.png" alt="Good Rod" title="Good Rod"/></th>
+[% END %]
+[% IF location_columns.${'super-rod'} %]
+    <th><img src="/dex-images/items/super-rod.png" alt="Super Rod" title="Super Rod"/></th>
+[% END %]
+</tr>
+[% END %]
 [% color = 1 %]
 [% FOR location IN encounters.keys.sort %]
@@ -332 +376 @@
 [%         methods = encounters.$location.$section %]
 <tr class="color[% color %]">
-    <td class="dex-locations-zone">[% location %]</td> <td class="dex-locations-zone">[% section %]</td>
-    <td>[% methods.grass.level %]</td> <td>[% methods.surfing.level %]</td> <td>[% methods.${'old-rod'}.level %]</td><td>[% methods.${'good-rod'}.level %]</td><td>[% methods.${'super-rod'}.level %]</td>
+    <td class="dex-locations-zone">[% location %]</td>[% IF location_columns.section %] <td class="dex-locations-zone">[% section %]</td>[% END %]
+[% IF location_columns.grass %]
+    <td>[% methods.grass.level %][% IF methods.grass.rarity %]<div class="rarity-container" title="[% methods.grass.rarity %]%"><div class="rarity-bar" style="width: [% methods.grass.rarity %]%;"></div></div>[% END %]</td>
+[% END %]
+[% IF location_columns.daytime %]
+    <td>[% IF methods.daytime %][% methods.daytime.level %][% IF methods.daytime.rarity %]<div class="rarity-container" title="[% methods.daytime.rarity %]%"><div class="rarity-bar" style="width: [% methods.daytime.rarity %]%;"></div></div>[% END %][% END %]</td>
+[% END %]
+[% IF location_columns.night %]
+    <td>[% IF methods.night %][% methods.night.level %][% IF methods.night.rarity %]<div class="rarity-container" title="[% methods.night.rarity %]%"><div class="rarity-bar" style="width: [% methods.night.rarity %]%;"></div></div>[% END %][% END %]</td>
+[% END %]
+[%         FOR m IN ['surfing', 'old-rod', 'good-rod', 'super-rod'] %]
+[%             NEXT IF NOT location_columns.$m %]
+    <td>[% methods.$m.level %]</td>
+[%         END %]
+[% IF location_columns.swarm %]
     <td>[% IF methods.swarm %]<img src="/dex-images/items/teachy-tv.png" alt="swarm"/>[% END %]</td>
-    <td>[% IF methods.morning %]<img src="/dex-images/items/light-stone.png" alt="morning"/>[% END %]</td>
-    <td>[% IF methods.night %]<img src="/dex-images/items/dark-stone.png" alt="night"/>[% END %]</td>
+[% END %]
+[% IF location_columns.poketore %]
     <td>[% IF methods.poketore %]<img src="/dex-images/items/poketore.png" alt="poketore"/>[% END %]</td>
+[% END %]
+[%         IF location_columns.dualslot %] 
     <td class="dex-locations-ds">[% Icons.ru IF methods.${'ds-ruby'} %]</td>
     <td class="dex-locations-ds">[% Icons.sa IF methods.${'ds-sapphire'} %]</td>
@@ -343 +402 @@
     <td class="dex-locations-ds">[% Icons.fr IF methods.${'ds-firered'}%]</td>
     <td class="dex-locations-ds">[% Icons.lg IF methods.${'ds-leafgreen'} %] </td>
+[% END %]
 </tr>
 [%         color = 3 - color %]
@@ -384 +444 @@
 <p> Note: accuracies are for G/S/C and RuSa.  Keep in mind that R/B/Y accuracies are about 0.4% (1 in 255) lower than those shown. </p>
 [% IF preferred_damage %]
-<p> [% this.name %]'s [% preferred_damage == 'special' ? 'Special ' : '' %]Attack is higher, so it is better off using [% preferred_damage %] (<img src="/dex-images/gameui/[% preferred_damage %].png" alt=""/>) moves.
-    These have been marked with a teal background for the damage icon. </p>
+<p> [% this.name %]'s [% preferred_damage == 'special' ? 'Special ' : '' %]Attack is higher, so it is better off using [% preferred_damage %] (<img src="/dex-images/gameui/[% preferred_damage %].png" alt=""/>) moves. </p>
 [% END %]
 <p> [% this.name %] gets the <acronym title="Same-Type Attack Bonus">STAB</acronym> from [% type_name(this.type1) %]
 [%- IF this.type2 %]
  and [% type_name(this.type2) %]
-[% END %] moves.
-    These have been marked with a teal background for the type. </p>
+[% END %] moves. </p>
 <table class="dex-table" cellspacing="0">
 <!-- XXX: this is total crap and could stand to get one hell of a refactor.  again.  maybe for 5th gen. -->
-<tr class="header">
+<tr class="heading">
 [% version_headers %]
 [% move_header %]
@@ -418 +476 @@
 <!--egg-->
 [% IF moves.egg.size %]
-<tr class="header"> [% version_headers %] <th colspan="7" class="title"> Egg moves [% IF moves.machine.size %](Pok&eacute;mon can also inherit any TMs they are compatible with)[% END %] </th> </tr>
+<tr class="heading"> [% version_headers %] <th colspan="7" class="title"> Egg moves [% IF moves.machine.size %](Pok&eacute;mon can also inherit any TMs they are compatible with)[% END %] </th> </tr>
 [%     FOREACH move IN moves.egg %]
 [%         moveid = move.moveid %]
@@ -441 +499 @@
 <!--tutor-->
 [% IF moves.tutor.size %]
-<tr class="header"> [% version_headers %] <th colspan="7" class="dextbl_divider"> Tutored moves </th> </tr>
+<tr class="heading"> [% version_headers %] <th colspan="7" class="dextbl_divider"> Tutored moves </th> </tr>
 [%     FOREACH move IN moves.tutor %]
 [%         moveid = move.moveid %]
@@ -468 +526 @@
 <!--other-->
 [% IF moves.other.size %]
-<tr class="header"> [% version_headers %] <th colspan="7" class="dextbl_divider"> Miscellaneous moves </th> </tr>
+<tr class="heading"> [% version_headers %] <th colspan="7" class="dextbl_divider"> Miscellaneous moves </th> </tr>
 [%     FOREACH move IN moves.other %]
 [%         moveid = move.moveid %]
@@ -481 +539 @@
 <!--machines-->
 [% IF moves.machine.size %]
-<tr class="header"> [% version_headers %] <th colspan="7" class="dextbl_divider"> TMs and HMs </th> </tr>
+<tr class="heading"> [% version_headers %] <th colspan="7" class="dextbl_divider"> TMs and HMs </th> </tr>
 [%     FOR move IN moves.machine %]
 [%         moveid = move.moveid %]

veekun/branches/layout/templates/style/dex.tt

@@ -75 +75 @@
   .dex-table .name  { width: 8em; text-align: center; }
   .dex-table .type  { width: 3em; text-align: center; }
-  .dex-table .class { width: 16px; text-align: center; }
   .dex-table .pp    { width: 2em; text-align: center; }
   .dex-table .power { width: 6em; text-align: center; }
@@ -81 +80 @@
   .dex-table td.acc { text-align: right; }
   .dex-table td.blurb { font-size: 85%; }
-  .dex-table tr.header th { background: #e6d3b8; color: #806640; border: 1px solid #c0a680; border-left: none; border-right: none; }
+  .dex-table tr.heading th { background: #e6d3b8; color: #806640; border: 1px solid #c0a680; border-left: none; border-right: none; }
+
+/* locations table */
+.dex-locations { width: auto; }
+  .dex-locations td { padding-left: 1em; padding-right: 1em; text-align: center; }
+  .dex-locations .rarity-container { border: 1px solid #806640; }
+  .dex-locations .rarity-bar { background-color: #c0a680; height: 4px; }
 
 
 
+
+

veekun/branches/layout/templates/style/global.tt

@@ -83 +83 @@
 #footer { -moz-border-radius-bottomright: 64px; }
 
+#breadcrumbs a { padding: 0.25em; margin: 0 -0.25em; border: 1px solid transparent; }
+#breadcrumbs a:hover { background: url(/images/bg-fade.png) [% hover_medium %] fixed left bottom no-repeat; border-color: [% hover_dark %]; }
+
 /* sql dump table */
 table#sqldump tr td, table#sqldump tr th { padding: 3px; vertical-align: top; }

veekun/branches/layout/templates/style/index.tt

@@ -4 +4 @@
 
 .front-box { padding: 0.5em; padding-top: 1em; }
-  .front-box .heading { position: relative; padding: 0.25em; padding-left: 4em; display: block; background-color: #e6d3b8; text-decoration: none; font-weight: bold; letter-spacing: 2px; color: #806640; border: 1px solid #806640; border-left: none; border-right: none; }
+  .front-box .heading { position: relative; padding: 0.25em; padding-left: 4em; display: block; background-color: #e6d3b8; text-decoration: none; font-weight: bold; letter-spacing: 2px; color: #806640; border: 1px solid #c0a680; border-left: none; border-right: none; }
   .front-box .heading:hover { background-color: #d89090; color: #802020; border-color: #802020; }
   .front-box .heading .icon { position: absolute; left: 0.5em; bottom: 0.25em; }

veekun/branches/layout/templates/wrapper.tt

@@ -116 +116 @@
 [% IF info_msg %]<div class="info"><div class="info-header">Information</div><div class="info-content">[% info_msg.join('<br/>') %]</div></div>[% END %]
 [% IF success_msg %]<div class="success"><div class="success-header">Success!</div><div class="success-content">[% success_msg.join('<br/>') %]</div></div>[% END %]
-[% IF crumbs %]<div class="breadcrumbs">You are here: [% crumbs.join(' :: ') %]</div>[% END %]
+[% IF crumbs %]<div id="breadcrumbs">You are here: [% crumbs.join(' :: ') %]</div>[% END %]
 [% END # skip_wrapper %]
 [% content %]