Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pound move #885

Merged
merged 3 commits into from
Jun 3, 2023
Merged

Fix pound move #885

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b3bbf5
data: fix pound move
Naramsim May 30, 2023
3b8c9ae
data: fix pound id on SV pokemon_moves
JulesLetters May 31, 2023
bc6ef9b
Merge pull request #886 from JulesLetters/pound
Naramsim Jun 1, 2023
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
10 changes: 2 additions & 8 deletions data/v2/csv/move_names.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8451,14 +8451,8 @@ move_id,local_language_id,name
874,4,淘金潮
874,9,Make It Rain
874,11,ゴールドラッシュ
875,1,はたく
875,4,拍击
875,9,Pound
875,11,はたく
876,1,はたく
876,4,拍击
876,9,Pound
876,11,はたく
875,9,Psyblade
876,9,Hydro Steam
877,1,カタストロフィ
877,4,大灾难
877,9,Ruination
Expand Down
6 changes: 2 additions & 4 deletions data/v2/csv/moves.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,8 +873,8 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
872,aqua-step,9,11,80,10,100,0,10,2,,,,,
873,raging-bull,9,1,90,10,100,0,10,2,,,,,
874,make-it-rain,9,9,120,5,100,0,11,3,,,,,
875,pound,9,1,40,35,100,0,10,2,,,,,
876,pound,9,1,40,35,100,0,10,2,,,,,
875,psyblade,9,14,80,15,100,0,10,2,,,,,
876,hydro-steam,9,11,80,15,100,0,10,3,,,,,
877,ruination,9,17,1,10,90,0,10,3,,,,,
878,collision-course,9,2,100,5,100,0,10,2,,,,,
879,electro-drift,9,13,100,5,100,0,10,3,,,,,
Expand All @@ -899,8 +899,6 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
898,noxious-torque,9,4,100,10,100,0,10,2,,,,,
899,combat-torque,9,2,100,10,100,0,10,2,,,,,
900,magical-torque,9,18,100,10,100,0,10,2,,,,,
901,hydro-steam,9,11,80,15,100,0,10,3,,,,,
902,psyblade,9,14,80,15,100,0,10,2,,,,,
10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,
Expand Down
4 changes: 2 additions & 2 deletions data/v2/csv/pokemon_moves.csv
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move 876 is still listed in this file 45 times. There should only be one occurence - for pokemon 1009. Move 875 is correctly only present in this file once.

Copy link
Contributor

@JulesLetters JulesLetters May 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've created a patch to address this but don't have permissions for the branch. What's the best way to proceed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can create a PR from your forked repo

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, that's in. #886
It's a merge of my own 'pound' branch to the existing one. Let me know if you'd rather have one merging that 'pound' branch to 'master'.

Original file line number Diff line number Diff line change
Expand Up @@ -513234,7 +513234,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
1009,25,225,1,28,
1009,25,784,1,35,
1009,25,407,1,42,
1009,25,901,1,56,
1009,25,876,1,56,
1009,25,406,1,63,
1009,25,200,1,70,
1009,25,53,1,77,
Expand Down Expand Up @@ -513287,7 +513287,7 @@ pokemon_id,version_group_id,move_id,pokemon_move_method_id,level,order
1010,25,14,1,35,
1010,25,533,1,42,
1010,25,348,1,49,
1010,25,902,1,56,
1010,25,875,1,56,
1010,25,370,1,63,
1010,25,286,1,70,
1010,25,224,1,77,
Expand Down