Skip to content

Commit c820619

Browse files
authored
Merge pull request #1276 from Adri1/master
Multiple corrections
2 parents 66293d2 + e53c06c commit c820619

21 files changed

+715
-715
lines changed

data/v2/csv/conquest_episode_names.csv

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ episode_id,local_language_id,name
4040
20,7,Soplando en el Viento
4141
20,9,Blowing in the Wind
4242
21,7,Belleza Legendaria de Ransei
43-
21,9,Ransei's Legendary Beauty
43+
21,9,Ranseis Legendary Beauty
4444
22,7,Todo Crece
4545
22,9,All Grown Up
4646
23,7,El Rebelde
@@ -52,13 +52,13 @@ episode_id,local_language_id,name
5252
26,7,La Rosa de Ransei
5353
26,9,The Rose of Ransei
5454
27,7,La Misión del Visionario
55-
27,9,The Visionary's Quest
55+
27,9,The Visionarys Quest
5656
28,7,Gracia y Belleza
5757
28,9,Grace and Beauty
5858
29,7,Pokémari y Yo
5959
29,9,Pokémari and Me
6060
30,7,El Sueño del Dragón
61-
30,9,The Dragon's Dream
61+
30,9,The Dragons Dream
6262
31,7,Dejando Abajo los Libros
6363
31,9,Putting the Books Down
6464
32,7,Una Cita con el Destino
@@ -72,6 +72,6 @@ episode_id,local_language_id,name
7272
36,7,Belleza Destino de Nacimiento
7373
36,9,A Fate Born of Beauty
7474
37,7,El Sendero del Espíritu Libre
75-
37,9,The Free Spirit's Path
75+
37,9,The Free Spirits Path
7676
38,7,Dos Héroes de Ransei
7777
38,9,Two Heroes of Ransei

data/v2/csv/conquest_move_effect_prose.csv

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@ conquest_move_effect_id,local_language_id,short_effect,effect
22
1,9,Inflicts exactly 40 HP in damage.,"Inflicts exactly 40 HP in damage, unaffected by stats or types."
33
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.
44
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."
5-
4,9,Ignores $target's stat modifiers.,"Inflicts damage, ignoring $target's stat modifiers."
6-
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."
7-
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."
5+
4,9,Ignores $targets stat modifiers.,"Inflicts damage, ignoring $targets stat modifiers."
6+
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."
7+
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."
88
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.
9-
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.
10-
9,9,Has an increased chance for a critical hit.,Inflicts regular damage. This move's critical hit rate is higher than usual.
9+
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.
10+
9,9,Has an increased chance for a critical hit.,Inflicts regular damage. This moves critical hit rate is higher than usual.
1111
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."
1212
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."
1313
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."
1414
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."
15-
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.
15+
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.
1616

1717
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."
1818
19,9,"User moves back one tile, switching places with any Pokémon already there.",Inflicts regular damage.
1919
20,9,Switches $target with the Pokémon behind it.,Inflicts regular damage.
2020
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.
2121
22,9,Teleports randomly.,The user teleports randomly to another tile.
2222
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."
23-
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.
23+
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.
2424
26,9,Damages the user if it misses.,"Inflicts regular damage. If this move misses, the user takes some damage."
25-
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.
26-
29,9,Lowers the user's Attack.,Inflicts regular damage. Lowers the user's Attack afterward.
27-
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.
28-
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.
29-
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.
25+
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.
26+
29,9,Lowers the users Attack.,Inflicts regular damage. Lowers the users Attack afterward.
27+
30,9,Has a $effect_chance% chance to lower $targets Defense.,Inflicts regular damage. Has a $effect_chance% chance to lower $targets Defense afterward.
28+
33,9,Has a $effect_chance% chance to lower $targets Speed.,Inflicts regular damage. Has a $effect_chance% chance to lower $targets Speed afterward.
29+
36,9,Has a $effect_chance% chance to lower $targets accuracy.,Inflicts regular damage. Has a $effect_chance% chance to lower $targets accuracy.
3030
37,9,Has a $effect_chance% chance to paralyze $target.,Inflicts regular damage. Has a $effect_chance% chance to paralyze $target.
3131
38,9,Puts $target to sleep.,Puts $target to sleep.
3232
39,9,Has a $effect_chance% chance to poison $target.,Inflicts regular damage. Has a $effect_chance% chance to poison $target.
@@ -35,22 +35,22 @@ In the turn in-between, the user can use this move again, but it will miss any t
3535
42,9,Has a $effect_chance% chance to freeze $target.,Inflicts regular damage. Has a $effect_chance% chance to freeze $target.
3636
43,9,Has a $effect_chance% chance to confuse $target.,Inflicts regular damage. Has a $effect_chance% chance to confuse $target.
3737
44,9,Has a $effect_chance% chance to make $target flinch.,Inflicts regular damage. Has a $effect_chance% chance to make $target flinch.
38-
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.
38+
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.
3939
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."
4040
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."
41-
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."
41+
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."
4242
52,9,Never misses.,"Inflicts regular damage. Always has 100% accuracy.
4343

4444
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}."
45-
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.
46-
59,9,Lowers the user's Attack and Defense.,Inflicts regular damage. Lowers the user's Attack and Defense afterward.
45+
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.
46+
59,9,Lowers the users Attack and Defense.,Inflicts regular damage. Lowers the users Attack and Defense afterward.
4747
60,9,Inflicts regular damage with no additional effect.,Inflicts regular damage.
4848
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."
4949
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."
50-
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.
51-
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."
50+
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.
51+
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."
5252
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."
53-
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.
53+
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.
5454
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."
5555
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.
5656
69,9,Does nothing.,Does nothing.

data/v2/csv/contest_effect_prose.csv

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ contest_effect_id,local_language_id,flavor_text,effect
88
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.
99
8,9,Startles all Pokémon that have done their appeals.,Attempts to jam all Pokémon that have appealed this turn.
1010
9,9,Startles the Pokémon that appealed before the user.,Attempts to jam the Pokémon that appealed before the user.
11-
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."
11+
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."
1212
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."
13-
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."
13+
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."
1414
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."
1515
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).
1616
15,9,Can avoid being startled by others.,Prevents jamming for the rest of this turn.
@@ -19,16 +19,16 @@ contest_effect_id,local_language_id,flavor_text,effect
1919
18,9,Makes all Pokémon after the user nervous.,Attempts to make all following Pokémon nervous (and thus unable to appeal).
2020
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.
2121
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.
22-
21,9,Scrambles up the order of appeals on the next turn.,Shuffles the next turn's turn order.
23-
22,9,Shifts the judge's attention from others.,Cancels combo standby status for all Pokémon that have appealed this turn.
22+
21,9,Scrambles up the order of appeals on the next turn.,Shuffles the next turns turn order.
23+
22,9,Shifts the judges attention from others.,Cancels combo standby status for all Pokémon that have appealed this turn.
2424
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."
2525
24,9,Temporarily stops the crowd from getting excited.,Prevents the Applause Meter from rising for the rest of the turn.
26-
25,9,The appeal's quality depends on its timing.,"Randomly earns one, two, four, or eight points."
26+
25,9,The appeals quality depends on its timing.,"Randomly earns one, two, four, or eight points."
2727
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."
2828
27,9,The appeal works great if performed first.,"If user appeals first this turn, earns six points instead of two."
2929
28,9,The appeal works great if performed last.,"If user appeals last this turn, earns six points instead of two."
30-
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."
30+
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."
3131
30,9,The next appeal can be made earlier next turn.,User will go first next turn.
3232
31,9,The next appeal can be made later next turn.,User will go last next turn.
33-
32,9,Ups the user's condition. Helps prevent nervousness.,User gains one star.
33+
32,9,Ups the users condition. Helps prevent nervousness.,User gains one star.
3434
33,9,Worsens the condition of those that made appeals.,Removes all stars from all Pokémon that have appealed this turn.

data/v2/csv/encounter_condition_value_prose.csv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ encounter_condition_value_id,local_language_id,name
161161
70,5,Après avoir rapporté la pièce de machine à la centrale
162162
71,9,Have an Event Arceus in the party
163163
71,5,En ayant un Arceus événementiel dans l’équipe
164-
72,9,This special Pokémon couldn't be captured in previous encounters (either fainted or ran from battle)
164+
72,9,This special Pokémon couldnt be captured in previous encounters (either fainted or ran from battle)
165165
73,9,Have Ice Key in bag
166166
74,9,Have Iron Key in bag
167167
75,9,Spoke to Professor Juniper in the Cave of Being
@@ -189,8 +189,8 @@ encounter_condition_value_id,local_language_id,name
189189
97,9,Have Tornadus and Thundurus in party
190190
98,9,Have Reshiram and Zekrom in party
191191
99,9,Captured all Ultra Beasts
192-
100,9,Finished Looker's Sidequest
193-
101,9,After finishing Olivia's trial
192+
100,9,Finished Lookers Sidequest
193+
101,9,After finishing Olivias trial
194194
102,9,Have Raikou and Entei in party
195195
103,9,Have Groudon and Kyogre in party
196196
104,9,Have Dialga and Palkia in party

data/v2/csv/evolution_trigger_prose.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ evolution_trigger_id,local_language_id,name
55
2,5,Échange
66
2,6,Tausch oder Verbindungsschnur
77
2,9,Trade or Linking Cord
8-
3,5,Utilisation d'un objet
8+
3,5,Utilisation dun objet
99
3,6,Gegenstand nutzen
1010
3,9,Use item
11-
4,5,Place dans l'équipe et une Poké Ball
11+
4,5,Place dans léquipe et une Poké Ball
1212
4,6,Platz im Team und ein Pokéball
1313
4,9,Shed
1414
5,9,Spin

data/v2/csv/generation_names.csv

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ generation_id,local_language_id,name
22
1,1,だいいちせだい
33
1,3,1세대
44
1,4,第一世代
5-
1,5,Génération I
5+
1,5,1re Génération
66
1,6,Generation I
77
1,7,Generación I
88
1,9,Generation I
@@ -11,7 +11,7 @@ generation_id,local_language_id,name
1111
2,1,だいにせだい
1212
2,3,2세대
1313
2,4,第二世代
14-
2,5,Génération II
14+
2,5,2e Génération
1515
2,6,Generation II
1616
2,7,Generación II
1717
2,9,Generation II
@@ -20,7 +20,7 @@ generation_id,local_language_id,name
2020
3,1,だいさんせだい
2121
3,3,3세대
2222
3,4,第三世代
23-
3,5,Génération III
23+
3,5,3e Génération
2424
3,6,Generation III
2525
3,7,Generación III
2626
3,9,Generation III
@@ -29,7 +29,7 @@ generation_id,local_language_id,name
2929
4,1,だいよんせだい
3030
4,3,4세대
3131
4,4,第四世代
32-
4,5,Génération IV
32+
4,5,4e Génération
3333
4,6,Generation IV
3434
4,7,Generación IV
3535
4,9,Generation IV
@@ -38,7 +38,7 @@ generation_id,local_language_id,name
3838
5,1,だいごせだい
3939
5,3,5세대
4040
5,4,第五世代
41-
5,5,Génération V
41+
5,5,5e Génération
4242
5,6,Generation V
4343
5,7,Generación V
4444
5,9,Generation V
@@ -47,7 +47,7 @@ generation_id,local_language_id,name
4747
6,1,だいろくせだい
4848
6,3,6세대
4949
6,4,第六世代
50-
6,5,Génération VI
50+
6,5,6e Génération
5151
6,6,Generation VI
5252
6,7,Generación VI
5353
6,9,Generation VI
@@ -56,7 +56,7 @@ generation_id,local_language_id,name
5656
7,1,だいななせだい
5757
7,3,7세대
5858
7,4,第七世代
59-
7,5,Génération VII
59+
7,5,7e Génération
6060
7,6,Generation VII
6161
7,7,Generación VII
6262
7,9,Generation VII
@@ -65,7 +65,7 @@ generation_id,local_language_id,name
6565
8,1,だいはちせだい
6666
8,3,8세대
6767
8,4,第八世代
68-
8,5,Génération VIII
68+
8,5,8e Génération
6969
8,6,Generation VIII
7070
8,7,Generación VIII
7171
8,9,Generation VIII
@@ -74,7 +74,7 @@ generation_id,local_language_id,name
7474
9,1,だいきゅうせだい
7575
9,3,9세대
7676
9,4,第九世代
77-
9,5,Génération IX
77+
9,5,9e Génération
7878
9,6,Generation IX
7979
9,7,Generación IX
8080
9,9,Generation IX

0 commit comments

Comments
 (0)