projects
/
zzz-pokedex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/encounters-i18n'
[zzz-pokedex.git]
/
pokedex
/
data
/
csv
/
encounter_conditions.csv
diff --git
a/pokedex/data/csv/encounter_conditions.csv
b/pokedex/data/csv/encounter_conditions.csv
index
ed34596
..
29a7d40
100644
(file)
--- a/
pokedex/data/csv/encounter_conditions.csv
+++ b/
pokedex/data/csv/encounter_conditions.csv
@@
-1,5
+1,6
@@
-id,name
-1,Swarm
-2,Time of day
-3,PokéRadar
-4,Gen 3 game in slot 2
+id,identifier
+1,swarm
+2,time
+3,radar
+4,slot2
+5,radio