From: Eevee <git@veekun.com>
Date: Tue, 29 Mar 2011 02:14:24 +0000 (-0700)
Subject: Merge branch 'schema-sanity'
X-Git-Tag: veekun-promotions/2011041101~33
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/a884a8b9766982880862defa2a1d2736de1a46a6?hp=-c

Merge branch 'schema-sanity'
---

a884a8b9766982880862defa2a1d2736de1a46a6
diff --combined pokedex/data/csv/move_effect_prose.csv
index 6103c50,a88a070..68610f9
--- a/pokedex/data/csv/move_effect_prose.csv
+++ b/pokedex/data/csv/move_effect_prose.csv
@@@ -1,4 -1,4 +1,4 @@@
- move_effect_id,language_id,short_effect,effect
+ move_effect_id,local_language_id,short_effect,effect
  1,9,Inflicts regular damage with no additional effect.,Inflicts [regular damage]{mechanic}.
  2,9,Puts the target to sleep.,Puts the target to [sleep]{mechanic}.
  3,9,Has a $effect_chance% chance to poison the target.,Inflicts [regular damage]{mechanic}.  Has a $effect_chance% chance to [poison]{mechanic} the target.
@@@ -418,7 -418,7 +418,7 @@@ This move cannot be copied by [Mirror M
  146,9,Raises the user's Defense by one stage.  User charges for one turn before attacking.,"Inflicts [regular damage]{mechanic}.  Raises the user's [Defense]{mechanic} by one [stage]{mechanic}.  User then charges for one turn before attacking.
  
  This move cannot be selected by [Sleep Talk]{move}."
 -147,9,Has chance to make the target flinch.,"Inflicts [regular damage]{mechanic}.  Has a $effect_chance% chance to make each target [flinch]{mechanic}.
 +147,9,Has a $effect_chance% chance to make the target flinch.,"Inflicts [regular damage]{mechanic}.  Has a $effect_chance% chance to make each target [flinch]{mechanic}.
  
  If the target is under the effect of [Bounce]{move}, [Fly]{move}, or [Sky Drop]{move}, this move will hit with double power."
  148,9,Inflicts regular damage and can hit Dig users.,"Inflicts [regular damage]{mechanic}.