projects
/
zzz-pokedex.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
496d26c
)
Fix remakes' titles, e.g. "Fire Red" to "FireRed". #196
author
Zhorken
<zhorken@gmail.com>
Tue, 1 Jun 2010 17:20:25 +0000
(13:20 -0400)
committer
Zhorken
<zhorken@gmail.com>
Tue, 1 Jun 2010 17:20:25 +0000
(13:20 -0400)
Like I said, it is a bit funny-lookin', but it's correct.
pokedex/data/csv/encounter_condition_values.csv
patch
|
blob
|
history
pokedex/data/csv/versions.csv
patch
|
blob
|
history
pokedex/data/media/encounters/slot2-firered.png
[moved from
pokedex/data/media/versions/fire-red.png
with 100% similarity]
patch
|
blob
|
history
pokedex/data/media/encounters/slot2-leafgreen.png
[moved from
pokedex/data/media/versions/leaf-green.png
with 100% similarity]
patch
|
blob
|
history
pokedex/data/media/versions/firered.png
[moved from
pokedex/data/media/encounters/slot2-fire-red.png
with 100% similarity]
patch
|
blob
|
history
pokedex/data/media/versions/heartgold.png
[moved from
pokedex/data/media/versions/heart-gold.png
with 100% similarity]
patch
|
blob
|
history
pokedex/data/media/versions/leafgreen.png
[moved from
pokedex/data/media/encounters/slot2-leaf-green.png
with 100% similarity]
patch
|
blob
|
history
pokedex/data/media/versions/soulsilver.png
[moved from
pokedex/data/media/versions/soul-silver.png
with 100% similarity]
patch
|
blob
|
history
diff --git
a/pokedex/data/csv/encounter_condition_values.csv
b/pokedex/data/csv/encounter_condition_values.csv
index
a3ffc26
..
4b8d11e
100644
(file)
--- a/
pokedex/data/csv/encounter_condition_values.csv
+++ b/
pokedex/data/csv/encounter_condition_values.csv
@@
-10,8
+10,8
@@
id,encounter_condition_id,name,is_default
9,4,Ruby in slot 2,0
10,4,Sapphire in slot 2,0
11,4,Emerald in slot 2,0
-12,4,Fire
Red in slot 2,0
-13,4,Leaf
Green in slot 2,0
+12,4,FireRed in slot 2,0
+13,4,LeafGreen in slot 2,0
14,5,Radio off,1
15,5,Hoenn radio,0
16,5,Sinnoh radio,0
diff --git
a/pokedex/data/csv/versions.csv
b/pokedex/data/csv/versions.csv
index
b6b3fd2
..
2b1b9b8
100644
(file)
--- a/
pokedex/data/csv/versions.csv
+++ b/
pokedex/data/csv/versions.csv
@@
-8,10
+8,10
@@
id,version_group_id,name
7,5,Ruby
8,5,Sapphire
9,6,Emerald
-10,7,Fire
Red
-11,7,Leaf
Green
+10,7,FireRed
+11,7,LeafGreen
12,8,Diamond
13,8,Pearl
14,9,Platinum
-15,10,Heart
Gold
-16,10,Soul
Silver
+15,10,HeartGold
+16,10,SoulSilver
diff --git
a/pokedex/data/media/versions/fire-red.png
b/pokedex/data/media/encounters/slot2-firered.png
similarity index 100%
rename from
pokedex/data/media/versions/fire-red.png
rename to
pokedex/data/media/encounters/slot2-firered.png
diff --git
a/pokedex/data/media/versions/leaf-green.png
b/pokedex/data/media/encounters/slot2-leafgreen.png
similarity index 100%
rename from
pokedex/data/media/versions/leaf-green.png
rename to
pokedex/data/media/encounters/slot2-leafgreen.png
diff --git
a/pokedex/data/media/encounters/slot2-fire-red.png
b/pokedex/data/media/versions/firered.png
similarity index 100%
rename from
pokedex/data/media/encounters/slot2-fire-red.png
rename to
pokedex/data/media/versions/firered.png
diff --git
a/pokedex/data/media/versions/heart-gold.png
b/pokedex/data/media/versions/heartgold.png
similarity index 100%
rename from
pokedex/data/media/versions/heart-gold.png
rename to
pokedex/data/media/versions/heartgold.png
diff --git
a/pokedex/data/media/encounters/slot2-leaf-green.png
b/pokedex/data/media/versions/leafgreen.png
similarity index 100%
rename from
pokedex/data/media/encounters/slot2-leaf-green.png
rename to
pokedex/data/media/versions/leafgreen.png
diff --git
a/pokedex/data/media/versions/soul-silver.png
b/pokedex/data/media/versions/soulsilver.png
similarity index 100%
rename from
pokedex/data/media/versions/soul-silver.png
rename to
pokedex/data/media/versions/soulsilver.png