-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5937 from PokemonGoF/dev
Dev merge to master
- Loading branch information
Showing
9 changed files
with
4,605 additions
and
3,528 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,37 @@ | ||
| { | ||
| "0": "Unknown", | ||
|
|
||
| "1": "Pokeball", | ||
| "2": "Greatball", | ||
| "3": "Ultraball", | ||
| "4": "Masterball", | ||
|
|
||
| "101": "Potion", | ||
| "102": "Super Potion", | ||
| "103": "Hyper Potion", | ||
| "104": "Max Potion", | ||
|
|
||
| "201": "Revive", | ||
| "202": "Max Revive", | ||
|
|
||
| "301": "Lucky Egg", | ||
|
|
||
| "401": "Incense", | ||
| "402": "Spicy Incense", | ||
| "403": "Cool Incense", | ||
| "404": "Floral Incense", | ||
|
|
||
| "501": "Troy Disk", | ||
|
|
||
| "602": "X Attack", | ||
| "603": "X Defense", | ||
| "604": "X Miracle", | ||
|
|
||
| "701": "Razz Berry", | ||
| "702": "Bluk Berry", | ||
| "703": "Nanab Berry", | ||
| "704": "Wepar Berry", | ||
| "705": "Pinap Berry", | ||
|
|
||
| "801": "Special Camera", | ||
|
|
||
| "901": "Incubator (Unlimited)", | ||
| "902": "Incubator", | ||
|
|
||
| "1001": "Pokemon Storage Upgrade", | ||
| "1002": "Item Storage Upgrade", | ||
|
|
||
| "1101": "Sun Stone", | ||
| "1102": "Kings Rock", | ||
| "1103": "Metal Coat", | ||
| "1104": "Dragon Scale", | ||
| "1105": "Upgrade" | ||
| } | ||
| "0": "Unknown", | ||
| "1": "Pokeball", | ||
| "2": "Greatball", | ||
| "3": "Ultraball", | ||
| "4": "Masterball", | ||
| "101": "Potion", | ||
| "102": "Super Potion", | ||
| "103": "Hyper Potion", | ||
| "104": "Max Potion", | ||
| "201": "Revive", | ||
| "202": "Max Revive", | ||
| "301": "Lucky Egg", | ||
| "401": "Incense Ordinary", | ||
| "402": "Spicy Incense", | ||
| "403": "Cool Incense", | ||
| "404": "Floral Incense", | ||
| "501": "Troy Disk", | ||
| "602": "X Attack", | ||
| "603": "X Defense", | ||
| "604": "X Miracle", | ||
| "701": "Razz Berry", | ||
| "702": "Bluk Berry", | ||
| "703": "Nanab Berry", | ||
| "704": "Wepar Berry", | ||
| "705": "Pinap Berry", | ||
| "801": "Special Camera", | ||
| "901": "Incubator Basic Unlimited", | ||
| "902": "Incubator Basic", | ||
| "1001": "Pokemon Storage Upgrade", | ||
| "1002": "Storage Upgrade", | ||
| "1101": "Sun Stone", | ||
| "1102": "Kings Rock", | ||
| "1103": "Metal Coat", | ||
| "1104": "Dragon Scale", | ||
| "1105": "Upgrade" | ||
| } |
Oops, something went wrong.