Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions data/v2/csv/conquest_episode_names.csv
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ episode_id,local_language_id,name
20,7,Soplando en el Viento
20,9,Blowing in the Wind
21,7,Belleza Legendaria de Ransei
21,9,Ransei's Legendary Beauty
21,9,Ranseis Legendary Beauty
22,7,Todo Crece
22,9,All Grown Up
23,7,El Rebelde
Expand All @@ -52,13 +52,13 @@ episode_id,local_language_id,name
26,7,La Rosa de Ransei
26,9,The Rose of Ransei
27,7,La Misión del Visionario
27,9,The Visionary's Quest
27,9,The Visionarys Quest
28,7,Gracia y Belleza
28,9,Grace and Beauty
29,7,Pokémari y Yo
29,9,Pokémari and Me
30,7,El Sueño del Dragón
30,9,The Dragon's Dream
30,9,The Dragons Dream
31,7,Dejando Abajo los Libros
31,9,Putting the Books Down
32,7,Una Cita con el Destino
Expand All @@ -72,6 +72,6 @@ episode_id,local_language_id,name
36,7,Belleza Destino de Nacimiento
36,9,A Fate Born of Beauty
37,7,El Sendero del Espíritu Libre
37,9,The Free Spirit's Path
37,9,The Free Spirits Path
38,7,Dos Héroes de Ransei
38,9,Two Heroes of Ransei
38 changes: 19 additions & 19 deletions data/v2/csv/conquest_move_effect_prose.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@ conquest_move_effect_id,local_language_id,short_effect,effect
1,9,Inflicts exactly 40 HP in damage.,"Inflicts exactly 40 HP in damage, unaffected by stats or types."
2,9,Has double power if $target has a major status ailment.,Inflicts regular damage. Has double power if $target has a major status ailment.
3,9,Doubles in power with each consecutive successful use.,"Inflicts regular damage. Every time this move succeeds, its power doubles; if it fails or is not used for a turn, it resets."
4,9,Ignores $target's stat modifiers.,"Inflicts damage, ignoring $target's stat modifiers."
5,9,Power rises the faster the user is compared to $target.,"Inflicts regular damage. The greater the user's Speed compared to $target's, the more power this move has."
6,9,Power rises the slower the user is compared to $target.,"Inflicts regular damage. The lower the user's Speed compared to $target's, the more power this move has."
4,9,Ignores $targets stat modifiers.,"Inflicts damage, ignoring $targets stat modifiers."
5,9,Power rises the faster the user is compared to $target.,"Inflicts regular damage. The greater the users Speed compared to $targets, the more power this move has."
6,9,Power rises the slower the user is compared to $target.,"Inflicts regular damage. The lower the users Speed compared to $targets, the more power this move has."
7,9,Has double power if $target has already taken damage this turn.,Inflicts regular damage. Has double power if $target has already taken damage this turn.
8,9,Inflicts damage based on $target's Attack stat instead of the user's.,Inflicts regular damage. Damage is calculated using $target's Attack stat rather than the user's.
9,9,Has an increased chance for a critical hit.,Inflicts regular damage. This move's critical hit rate is higher than usual.
8,9,Inflicts damage based on $targets Attack stat instead of the users.,Inflicts regular damage. Damage is calculated using $targets Attack stat rather than the users.
9,9,Has an increased chance for a critical hit.,Inflicts regular damage. This moves critical hit rate is higher than usual.
14,9,Hits 2 to 5 times in one turn.,"Inflicts regular damage. Hits two to five times in one turn, with damage calculated separately each time."
15,9,Hits 4 to 5 times in one turn.,"Inflicts regular damage. Hits four to five times in one turn, with damage calculated separately each time."
16,9,Digs underground and hits at the beginning of the next turn.,"Inflicts regular damage. The user digs underground, dodging all moves until it attacks. At the beginning of the next turn, the user hits $target, even if $target has moved, and cannot move again that turn."
17,9,Lifts $target into the sky and hits at the beginning of the next turn.,"Inflicts regular damage. The user carries $target into the sky. No moves can hit either Pokémon in this state. At the beginning of the next turn, the user slams $target to the ground, inflicting regular damage. The user cannot move again that turn."
18,9,Hits $target at the beginning of the turn after next.,"Inflicts regular damage. Hits $target at the beginning of the user's turn two turns after this one, even if the target has moved.
18,9,Hits $target at the beginning of the turn after next.,"Inflicts regular damage. Hits $target at the beginning of the users turn two turns after this one, even if the target has moved.

In the turn in-between, the user can use this move again, but it will miss any target that already has a Future Sight pending."
19,9,"User moves back one tile, switching places with any Pokémon already there.",Inflicts regular damage.
20,9,Switches $target with the Pokémon behind it.,Inflicts regular damage.
21,9,Heals the user by half the damage dealt.,Inflicts regular damage. The user heals for half as many HP as it dealt in damage.
22,9,Teleports randomly.,The user teleports randomly to another tile.
23,9,Cannot be used the turn after hitting.,"Inflicts regular damage. If the move succeeds, it cannot be used again on the next turn."
25,9,Lowers the user's range and Defense until its next turn.,Inflicts regular damage. The user's Defense is lowered and its range is lowered to one tile until the beginning of its next turn.
25,9,Lowers the users range and Defense until its next turn.,Inflicts regular damage. The users Defense is lowered and its range is lowered to one tile until the beginning of its next turn.
26,9,Damages the user if it misses.,"Inflicts regular damage. If this move misses, the user takes some damage."
28,9,Has a $effect_chance% chance to raise the user's Attack.,Inflicts regular damage. Has a $effect_chance% chance to raise the user's Attack afterward.
29,9,Lowers the user's Attack.,Inflicts regular damage. Lowers the user's Attack afterward.
30,9,Has a $effect_chance% chance to lower $target's Defense.,Inflicts regular damage. Has a $effect_chance% chance to lower $target's Defense afterward.
33,9,Has a $effect_chance% chance to lower $target's Speed.,Inflicts regular damage. Has a $effect_chance% chance to lower $target's Speed afterward.
36,9,Has a $effect_chance% chance to lower $target's accuracy.,Inflicts regular damage. Has a $effect_chance% chance to lower $target's accuracy.
28,9,Has a $effect_chance% chance to raise the users Attack.,Inflicts regular damage. Has a $effect_chance% chance to raise the users Attack afterward.
29,9,Lowers the users Attack.,Inflicts regular damage. Lowers the users Attack afterward.
30,9,Has a $effect_chance% chance to lower $targets Defense.,Inflicts regular damage. Has a $effect_chance% chance to lower $targets Defense afterward.
33,9,Has a $effect_chance% chance to lower $targets Speed.,Inflicts regular damage. Has a $effect_chance% chance to lower $targets Speed afterward.
36,9,Has a $effect_chance% chance to lower $targets accuracy.,Inflicts regular damage. Has a $effect_chance% chance to lower $targets accuracy.
37,9,Has a $effect_chance% chance to paralyze $target.,Inflicts regular damage. Has a $effect_chance% chance to paralyze $target.
38,9,Puts $target to sleep.,Puts $target to sleep.
39,9,Has a $effect_chance% chance to poison $target.,Inflicts regular damage. Has a $effect_chance% chance to poison $target.
Expand All @@ -35,22 +35,22 @@ In the turn in-between, the user can use this move again, but it will miss any t
42,9,Has a $effect_chance% chance to freeze $target.,Inflicts regular damage. Has a $effect_chance% chance to freeze $target.
43,9,Has a $effect_chance% chance to confuse $target.,Inflicts regular damage. Has a $effect_chance% chance to confuse $target.
44,9,Has a $effect_chance% chance to make $target flinch.,Inflicts regular damage. Has a $effect_chance% chance to make $target flinch.
47,9,Permanently destroys $target's item if it is consumable.,Inflicts regular damage. Permanently destroys $target's item if the item can be consumed in battle.
47,9,Permanently destroys $targets item if it is consumable.,Inflicts regular damage. Permanently destroys $targets item if the item can be consumed in battle.
48,9,Has double power against Pokémon with less than half their max HP remaining.,"Inflicts regular damage. Has double power when calculating damage against a target with less than half its max HP remaining, on a target-by-target basis."
49,9,Has double power against poisoned Pokémon.,"Inflicts regular damage. Has double power when calculating damage against a poisoned target, on a target-by-target basis."
51,9,Uses $target's item if it is consumable.,"Inflicts regular damage. The user steals $target's item, if the item can be consumed in battle, and uses it on itself, or destroys it if it would have no effect."
51,9,Uses $targets item if it is consumable.,"Inflicts regular damage. The user steals $targets item, if the item can be consumed in battle, and uses it on itself, or destroys it if it would have no effect."
52,9,Never misses.,"Inflicts regular damage. Always has 100% accuracy.

This move still misses Pokémon under the effects of []{move:dig} or []{move:sky-drop} and can still be dodged by abilities such as []{ability:instinct}."
58,9,Has a $effect_chance% chance to lower $target's range by one tile.,Inflicts regular damage. Has a $effect_chance% chance to lower $target's range by one tile.
59,9,Lowers the user's Attack and Defense.,Inflicts regular damage. Lowers the user's Attack and Defense afterward.
58,9,Has a $effect_chance% chance to lower $targets range by one tile.,Inflicts regular damage. Has a $effect_chance% chance to lower $targets range by one tile.
59,9,Lowers the users Attack and Defense.,Inflicts regular damage. Lowers the users Attack and Defense afterward.
60,9,Inflicts regular damage with no additional effect.,Inflicts regular damage.
61,9,Has a $effect_chance% chance each to burn $target or make it flinch.,"Inflicts regular damage. Has a $effect_chance% chance to burn $target, and a $effect_chance% chance, separately rolled, to make $target flinch."
62,9,Has a $effect_chance% chance to burn $target. Thaws the user out if frozen.,"Inflicts regular damage. Has a $effect_chance% chance to burn $target. Can be used if the user is frozen, in which case it thaws out."
63,9,Lowers the user's range and Defense until its next turn. Has a $effect_chance% chance to paralyze $target.,Inflicts regular damage. The user's Defense is lowered and its range is lowered to one tile until the beginning of its next turn. Has a $effect_chance% chance to paralyze $target.
64,9,Hits 2 to 3 times in one turn. User has 0 range on its next turn.,"Inflicts regular damage. Hits two to three times in one turn, with damage calculated separately for each hit. The user's range is lowered to 0 on its next turn."
63,9,Lowers the users range and Defense until its next turn. Has a $effect_chance% chance to paralyze $target.,Inflicts regular damage. The users Defense is lowered and its range is lowered to one tile until the beginning of its next turn. Has a $effect_chance% chance to paralyze $target.
64,9,Hits 2 to 3 times in one turn. User has 0 range on its next turn.,"Inflicts regular damage. Hits two to three times in one turn, with damage calculated separately for each hit. The users range is lowered to 0 on its next turn."
65,9,Has double power and wakes $target up if it is asleep.,"Inflicts regular damage. If $target is asleep, this move has double power and wakes $target up."
66,9,Has a $effect_chance% chance to poison $target and an increased chance for a critical hit.,Inflicts damage. Has a $effect_chance% chance to poison $target. This move's critical hit rate is higher than usual.
66,9,Has a $effect_chance% chance to poison $target and an increased chance for a critical hit.,Inflicts damage. Has a $effect_chance% chance to poison $target. This moves critical hit rate is higher than usual.
67,9,Heals the user by half the damage inflicted. Only works if $target is asleep.,"Inflicts damage if $target is asleep, and fails otherwise. Heals the user for half as many HP as it dealt in damage."
68,9,Hits twice in one turn. Has a $effect_chance% chance to poison $target with each hit.,Inflicts regular damage. Hits twice in one turn. Has a $effect_chance% chance to poison $target with each hit.
69,9,Does nothing.,Does nothing.
14 changes: 7 additions & 7 deletions data/v2/csv/contest_effect_prose.csv
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ contest_effect_id,local_language_id,flavor_text,effect
7,9,"Makes a great appeal, but allows no more to the end.",User cannot make any more appeals for the remainder of the contest.
8,9,Startles all Pokémon that have done their appeals.,Attempts to jam all Pokémon that have appealed this turn.
9,9,Startles the Pokémon that appealed before the user.,Attempts to jam the Pokémon that appealed before the user.
10,9,Startles the Pokémon that has the judge's attention.,"Attempts to jam all Pokémon that have appealed this turn. If a Pokémon is in combo standby status, it is jammed 5 points instead of 1."
10,9,Startles the Pokémon that has the judges attention.,"Attempts to jam all Pokémon that have appealed this turn. If a Pokémon is in combo standby status, it is jammed 5 points instead of 1."
11,9,The appeal works best the more the crowd is excited.,"If the Applause meter is empty or at one, earns one point; if two, earns three points; if three, earns four points; if four, earns six points."
12,9,Works well if it's the same type as the one before.,"If the last Pokémon's appeal is the same type as this move, user earns six points instead of two."
12,9,Works well if its the same type as the one before.,"If the last Pokémons appeal is the same type as this move, user earns six points instead of two."
13,9,An appeal that excites the audience in any contest.,"Always adds a point to the applause meter, regardless of whether the move matches the contest, and can likewise gain the applause bonus."
14,9,Badly startles all Pokémon that made good appeals.,Attempts to jam all Pokémon that have appealed this turn for half their appeal points (minimum 1).
15,9,Can avoid being startled by others.,Prevents jamming for the rest of this turn.
Expand All @@ -19,16 +19,16 @@ contest_effect_id,local_language_id,flavor_text,effect
18,9,Makes all Pokémon after the user nervous.,Attempts to make all following Pokémon nervous (and thus unable to appeal).
19,9,Makes the appeal as good as the one before it.,User earns appeal points equal to the points the previous Pokémon earned plus one.
20,9,Makes the appeal as good as those before it.,User earns appeal points equal to half the points ALL the previous Pokémon earned plus one.
21,9,Scrambles up the order of appeals on the next turn.,Shuffles the next turn's turn order.
22,9,Shifts the judge's attention from others.,Cancels combo standby status for all Pokémon that have appealed this turn.
21,9,Scrambles up the order of appeals on the next turn.,Shuffles the next turns turn order.
22,9,Shifts the judges attention from others.,Cancels combo standby status for all Pokémon that have appealed this turn.
23,9,Startles Pokémon that made a same-type appeal.,"Attempts to jam all Pokémon that have appealed this turn. If a Pokémon used the same type move as this one, it is jammed for 4 points instead of 1."
24,9,Temporarily stops the crowd from getting excited.,Prevents the Applause Meter from rising for the rest of the turn.
25,9,The appeal's quality depends on its timing.,"Randomly earns one, two, four, or eight points."
25,9,The appeals quality depends on its timing.,"Randomly earns one, two, four, or eight points."
26,9,The appeal works better the later it is performed.,"If user appeals first this turn, earns one point; if second, two points; if third, four points; if last, six points."
27,9,The appeal works great if performed first.,"If user appeals first this turn, earns six points instead of two."
28,9,The appeal works great if performed last.,"If user appeals last this turn, earns six points instead of two."
29,9,The appeal works well if the user's condition is good.,"If user has no stars, earns one point; if one, three points; if two, five points; if three, seven points. This does not include the appeal point bonus the stars give."
29,9,The appeal works well if the users condition is good.,"If user has no stars, earns one point; if one, three points; if two, five points; if three, seven points. This does not include the appeal point bonus the stars give."
30,9,The next appeal can be made earlier next turn.,User will go first next turn.
31,9,The next appeal can be made later next turn.,User will go last next turn.
32,9,Ups the user's condition. Helps prevent nervousness.,User gains one star.
32,9,Ups the users condition. Helps prevent nervousness.,User gains one star.
33,9,Worsens the condition of those that made appeals.,Removes all stars from all Pokémon that have appealed this turn.
6 changes: 3 additions & 3 deletions data/v2/csv/encounter_condition_value_prose.csv
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ encounter_condition_value_id,local_language_id,name
70,5,Après avoir rapporté la pièce de machine à la centrale
71,9,Have an Event Arceus in the party
71,5,En ayant un Arceus événementiel dans l’équipe
72,9,This special Pokémon couldn't be captured in previous encounters (either fainted or ran from battle)
72,9,This special Pokémon couldnt be captured in previous encounters (either fainted or ran from battle)
73,9,Have Ice Key in bag
74,9,Have Iron Key in bag
75,9,Spoke to Professor Juniper in the Cave of Being
Expand Down Expand Up @@ -189,8 +189,8 @@ encounter_condition_value_id,local_language_id,name
97,9,Have Tornadus and Thundurus in party
98,9,Have Reshiram and Zekrom in party
99,9,Captured all Ultra Beasts
100,9,Finished Looker's Sidequest
101,9,After finishing Olivia's trial
100,9,Finished Lookers Sidequest
101,9,After finishing Olivias trial
102,9,Have Raikou and Entei in party
103,9,Have Groudon and Kyogre in party
104,9,Have Dialga and Palkia in party
Expand Down
4 changes: 2 additions & 2 deletions data/v2/csv/evolution_trigger_prose.csv
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ evolution_trigger_id,local_language_id,name
2,5,Échange
2,6,Tausch oder Verbindungsschnur
2,9,Trade or Linking Cord
3,5,Utilisation d'un objet
3,5,Utilisation dun objet
3,6,Gegenstand nutzen
3,9,Use item
4,5,Place dans l'équipe et une Poké Ball
4,5,Place dans léquipe et une Poké Ball
4,6,Platz im Team und ein Pokéball
4,9,Shed
5,9,Spin
Expand Down
18 changes: 9 additions & 9 deletions data/v2/csv/generation_names.csv
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ generation_id,local_language_id,name
1,1,だいいちせだい
1,3,1세대
1,4,第一世代
1,5,Génération I
1,5,1re Génération
1,6,Generation I
1,7,Generación I
1,9,Generation I
Expand All @@ -11,7 +11,7 @@ generation_id,local_language_id,name
2,1,だいにせだい
2,3,2세대
2,4,第二世代
2,5,Génération II
2,5,2e Génération
2,6,Generation II
2,7,Generación II
2,9,Generation II
Expand All @@ -20,7 +20,7 @@ generation_id,local_language_id,name
3,1,だいさんせだい
3,3,3세대
3,4,第三世代
3,5,Génération III
3,5,3e Génération
3,6,Generation III
3,7,Generación III
3,9,Generation III
Expand All @@ -29,7 +29,7 @@ generation_id,local_language_id,name
4,1,だいよんせだい
4,3,4세대
4,4,第四世代
4,5,Génération IV
4,5,4e Génération
4,6,Generation IV
4,7,Generación IV
4,9,Generation IV
Expand All @@ -38,7 +38,7 @@ generation_id,local_language_id,name
5,1,だいごせだい
5,3,5세대
5,4,第五世代
5,5,Génération V
5,5,5e Génération
5,6,Generation V
5,7,Generación V
5,9,Generation V
Expand All @@ -47,7 +47,7 @@ generation_id,local_language_id,name
6,1,だいろくせだい
6,3,6세대
6,4,第六世代
6,5,Génération VI
6,5,6e Génération
6,6,Generation VI
6,7,Generación VI
6,9,Generation VI
Expand All @@ -56,7 +56,7 @@ generation_id,local_language_id,name
7,1,だいななせだい
7,3,7세대
7,4,第七世代
7,5,Génération VII
7,5,7e Génération
7,6,Generation VII
7,7,Generación VII
7,9,Generation VII
Expand All @@ -65,7 +65,7 @@ generation_id,local_language_id,name
8,1,だいはちせだい
8,3,8세대
8,4,第八世代
8,5,Génération VIII
8,5,8e Génération
8,6,Generation VIII
8,7,Generación VIII
8,9,Generation VIII
Expand All @@ -74,7 +74,7 @@ generation_id,local_language_id,name
9,1,だいきゅうせだい
9,3,9세대
9,4,第九世代
9,5,Génération IX
9,5,9e Génération
9,6,Generation IX
9,7,Generación IX
9,9,Generation IX
Expand Down
Loading
Loading