From 1f1496e7e4ef4f00c89d54b631804796994bec48 Mon Sep 17 00:00:00 2001
From: Eevee <git@veekun.com>
Date: Sat, 16 May 2009 22:16:19 -0700
Subject: [PATCH] Improved some location and area names.  #7

Great Marsh is now Great Marsh instead of Safari Zone.

Ruin Maniac Tunnel has been consolidated into one location, and the
areas are actually named informatively.

Turnback Cave has more appropriate area names.

Routes with two parts now mention the cardinal direction in the area
names.  Also, several town names have been fixed.

Lake Verity's area names now mention WHAT they are before/after.
---
 pokedex/data/csv/location_areas.csv | 38 ++++++++++++++++++-------------------
 pokedex/data/csv/locations.csv      |  7 +++----
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/pokedex/data/csv/location_areas.csv b/pokedex/data/csv/location_areas.csv
index c275db4..34db478 100644
--- a/pokedex/data/csv/location_areas.csv
+++ b/pokedex/data/csv/location_areas.csv
@@ -46,26 +46,26 @@ id,location_id,internal_id,name
 45,14,0,
 46,15,0,
 47,16,0,
-48,17,0,High-level (rooms 16-21)
-49,17,0,Low-level (rooms 4-9)
-50,17,0,Mid-level (most rooms)
+48,17,0,up to Pillar 3
+49,17,0,up to Pillar 1
+50,17,0,up to Pillar 2
 51,18,0,
 52,19,0,
 53,20,0,
-54,21,0,Floaroma City side
-55,21,0,Jubilife City side
-56,22,0,Eterna City side
-57,22,0,Floaroma City side
+54,21,0,"north, towards Floaroma City"
+55,21,0,"south, towards Jubilife City"
+56,22,0,"east, towards Eterna City"
+57,22,0,"south, towards Floaroma Town"
 58,23,0,
 59,24,0,
 60,25,0,
 61,26,0,
-62,27,0,Celestic City side
-63,27,0,Solaceon City side
-64,28,0,Celestic City side
-65,28,0,Eterna City side
-66,29,0,Hearthome City side
-67,29,0,Pastoria City side
+62,27,0,"west, towards Celestic Town"
+63,27,0,"south, towards Solaceon Town"
+64,28,0,"east, towards Celestic Town"
+65,28,0,"west, towards Eterna City"
+66,29,0,"north, towards Hearthome City"
+67,29,0,"east, towards Pastoria City"
 68,30,0,
 69,31,0,
 70,32,0,
@@ -112,8 +112,8 @@ id,location_id,internal_id,name
 111,51,0,inside exit
 112,52,0,
 113,53,0,
-114,54,0,
-115,54,0,expansion
+114,56,0,0–9 different Unown caught
+115,56,0,10–25 different Unown caught
 116,55,0,
 117,55,0,1F
 118,55,0,B1F left
@@ -121,7 +121,7 @@ id,location_id,internal_id,name
 120,55,0,B2F left
 121,55,0,B2F right
 122,55,0,B3F
-123,56,0,
+123,56,0,26+ different Unown caught
 124,57,0,2F
 125,57,0,2F left room
 126,57,0,2F leftmost room
@@ -136,7 +136,7 @@ id,location_id,internal_id,name
 135,60,0,
 136,61,0,
 137,62,0,
-138,63,0,after
-139,63,0,before
+138,63,0,after Galactic intervention
+139,63,0,before Galactic intervention
 140,78,0,
-141,17,0,"Mid-level (rooms 1, 10-15)"
+141,17,0,up to Pillar 2 (alternate)
diff --git a/pokedex/data/csv/locations.csv b/pokedex/data/csv/locations.csv
index 7ea6da6..2833b36 100644
--- a/pokedex/data/csv/locations.csv
+++ b/pokedex/data/csv/locations.csv
@@ -42,7 +42,7 @@ id,generation_id,name
 41,4,Route 227
 42,4,Route 228
 43,4,Route 229
-44,4,Safari Zone
+44,4,Great Marsh
 45,4,Route 220
 46,4,Route 223
 47,4,Route 226
@@ -52,14 +52,13 @@ id,generation_id,name
 51,4,Victory Road
 52,4,Ravaged Path
 53,4,Lake Acuity
-54,4,Ruins Maniac Cave
 55,4,Iron Island
-56,4,Ruins Maniac Tunnel
+56,4,Ruin Maniac Tunnel
 57,4,Old Chateau
 58,4,Acuity Lakefront
 59,4,Valor Lakefront
 60,4,Spring Path
-61,4,Pokemon Mansion
+61,4,Trophy Garden
 62,4,Lake Valor
 63,4,Lake Verity
 64,4,Sandgem Town
-- 
2.7.4