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

Jump to bottom

0.57.2 Gen 2 Support #5918

Merged
merged 9 commits into from
Feb 21, 2017
Merged

0.57.2 Gen 2 Support #5918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e61a41
Update to 0.57.2 Gen 2
MerlionRock Feb 18, 2017
23aa17b
Update to 0.57.2
MerlionRock Feb 18, 2017
59ae27c
Changes to deal with new Gen 2 changes
MerlionRock Feb 19, 2017
83eded4
Gen 2 and Gen 1 moves
MerlionRock Feb 19, 2017
c4bd984
Nidoran F & Nidoran M name correction
MerlionRock Feb 19, 2017
62f40bf
Energy can be negative, commented out test
MerlionRock Feb 19, 2017
3a75707
Nidoran M & Nidoran F Correcrion
MerlionRock Feb 19, 2017
962bf2a
Value Changes
MerlionRock Feb 19, 2017
3e9c6a4
Add files via upload
MerlionRock Feb 19, 2017
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
1,885 changes: 1,064 additions & 821 deletions data/charged_moves.json
View file
Open in desktop

Large diffs are not rendered by default.

913 changes: 533 additions & 380 deletions data/fast_moves.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion data/items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,11 @@
"902": "Incubator",

"1001": "Pokemon Storage Upgrade",
"1002": "Item Storage Upgrade"
"1002": "Item Storage Upgrade",

"1101": "Sun Stone",
"1102": "Kings Rock",
"1103": "Metal Coat",
"1104": "Dragon Scale",
"1105": "Upgrade"
}
Loading