Skip to content

Commit 14c2f06

Browse files
authored
Merge pull request #843 from noc7c9/fix-incorrect-csv-formatting
2 parents 7c8ef65 + bc23a2b commit 14c2f06

File tree

2 files changed

+54
-54
lines changed

2 files changed

+54
-54
lines changed

data/v2/csv/locations.csv

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -796,56 +796,56 @@ id,region_id,identifier
796796
812,3,faraway-island
797797
813,3,hoenn-battle-frontier
798798
814,2,johto-safari-zone
799-
815,10,cabo-poco,
800-
816,10,los-platos,
801-
817,10,mesagoza,
802-
818,10,cortondo,
803-
819,10,alfornada,
804-
820,10,pokemon-league,
805-
821,10,artazon,
806-
822,10,levincia,
807-
823,10,zapapico,
808-
824,10,cascarrafa,
809-
825,10,porto-marinada,
810-
826,10,medali,
811-
827,10,montenevera,
812-
828,10,paldea-south-province-area-one,
813-
829,10,paldea-south-province-area-two,
814-
830,10,paldea-south-province-area-three,
815-
831,10,paldea-south-province-area-four,
816-
832,10,paldea-south-province-area-five,
817-
833,10,paldea-south-province-area-six,
818-
834,10,south-paldean-sea,
819-
835,10,poco-path,
820-
836,10,inlet-grotto,
821-
837,10,naranja-academy/uva-academy,
822-
838,10,alfornada-cavern,
823-
839,10,grasswither-shrine,
824-
840,10,paldea-east-province-area-one,
825-
841,10,paldea-east-province-area-two,
826-
842,10,paldea-east-province-area-three,
827-
843,10,east-paldean-sea,
828-
844,10,tagtree-thicket,
829-
845,10,schedar-squads-base,
830-
846,10,navi-squads-base,
831-
847,10,paldea-west-province-area-one,
832-
848,10,paldea-west-province-area-two,
833-
849,10,paldea-west-province-area-three,
834-
850,10,asado-desert,
835-
851,10,west-paldean-sea,
836-
852,10,segin-squads-base,
837-
853,10,icerend-shrine,
838-
854,10,paldea-north-province-area-one,
839-
855,10,paldea-north-province-area-two,
840-
856,10,paldea-north-province-area-three,
841-
857,10,casseroya-lake,
842-
858,10,dalizapa-passage,
843-
859,10,glaseado-mountain,
844-
860,10,socarrat-trail,
845-
861,10,groundblight-shrine,
846-
862,10,firescourge-shrine,
847-
863,10,north-paldean-sea,
848-
864,10,ruchbah-squads-base,
849-
865,10,caph-squads-base,
850-
866,10,area-zero,
851-
867,10,zero-lab,
799+
815,10,cabo-poco
800+
816,10,los-platos
801+
817,10,mesagoza
802+
818,10,cortondo
803+
819,10,alfornada
804+
820,10,pokemon-league
805+
821,10,artazon
806+
822,10,levincia
807+
823,10,zapapico
808+
824,10,cascarrafa
809+
825,10,porto-marinada
810+
826,10,medali
811+
827,10,montenevera
812+
828,10,paldea-south-province-area-one
813+
829,10,paldea-south-province-area-two
814+
830,10,paldea-south-province-area-three
815+
831,10,paldea-south-province-area-four
816+
832,10,paldea-south-province-area-five
817+
833,10,paldea-south-province-area-six
818+
834,10,south-paldean-sea
819+
835,10,poco-path
820+
836,10,inlet-grotto
821+
837,10,naranja-academy/uva-academy
822+
838,10,alfornada-cavern
823+
839,10,grasswither-shrine
824+
840,10,paldea-east-province-area-one
825+
841,10,paldea-east-province-area-two
826+
842,10,paldea-east-province-area-three
827+
843,10,east-paldean-sea
828+
844,10,tagtree-thicket
829+
845,10,schedar-squads-base
830+
846,10,navi-squads-base
831+
847,10,paldea-west-province-area-one
832+
848,10,paldea-west-province-area-two
833+
849,10,paldea-west-province-area-three
834+
850,10,asado-desert
835+
851,10,west-paldean-sea
836+
852,10,segin-squads-base
837+
853,10,icerend-shrine
838+
854,10,paldea-north-province-area-one
839+
855,10,paldea-north-province-area-two
840+
856,10,paldea-north-province-area-three
841+
857,10,casseroya-lake
842+
858,10,dalizapa-passage
843+
859,10,glaseado-mountain
844+
860,10,socarrat-trail
845+
861,10,groundblight-shrine
846+
862,10,firescourge-shrine
847+
863,10,north-paldean-sea
848+
864,10,ruchbah-squads-base
849+
865,10,caph-squads-base
850+
866,10,area-zero
851+
867,10,zero-lab

data/v2/csv/move_effect_prose.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ Any [regular damage]{mechanic:regular-damage} dealt to an affected Pokémon is r
11191119
422,9,Sets [Reflect]{move:reflect} on the user's side of the field after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) sets []{move:reflect} on the user's side of the [field]{mechanic:field}."
11201120
423,9,Seeds the target after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) sets []{move:leech-seed} on the target."
11211121
424,9,Cures the entire party of major status effects after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) removes [major status effects]{mechanic:major-status-effects} from every Pokémon in the user's party."
1122-
425,9,Hits twice in one turn, with a $effect_chance% chance to make the target flinch.,"Inflicts [regular damage]{mechanic:regular-damage}. Hits twice in one turn, with a $effect_chance% chance to make the target [flinch]{mechanic:flinch}."
1122+
425,9,"Hits twice in one turn, with a $effect_chance% chance to make the target flinch.","Inflicts [regular damage]{mechanic:regular-damage}. Hits twice in one turn, with a $effect_chance% chance to make the target [flinch]{mechanic:flinch}."
11231123
443,9,Boosts the user's Speed and lowers their Defense by one stage after inflicting damage two to five times in a row.,"Inflicts [regular damage]{mechanic:regular-damage} two to five times in a row, raising the user's [Speed]{mechanic:speed} and lowering the user's [Defense]{mechanic:defense} by one [stage]{mechanic:stage} each upon last hit."
11241124
10001,9,Has an increased chance for a critical hit in Hyper Mode.,Inflicts [regular damage]{mechanic:regular-damage}. User's [critical hit]{mechanic:critical-hit} rate is one level higher when using this move while in [hyper mode]{mechanic:hyper-mode}.
11251125
10002,9,User receives 1/2 its HP in recoil.,Inflicts [regular damage]{mechanic:regular-damage}. User takes 1/2 of its current [HP]{mechanic:hp} in recoil.

0 commit comments

Comments
 (0)