-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
ORAS Mirage Forest Encounters #1441
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.
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
Open
ItsMeJoji
wants to merge
15
commits into
PokeAPI:master
Choose a base branch
from
ItsMeJoji:oras-mirage-spots
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+73
−1
Open
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
b20d671
Added Mirage Island Encounters
ItsMeJoji b6f603b
Updated IDs
ItsMeJoji 47c9667
Correct encounter entries with correct location-area ids
ItsMeJoji 05e02d2
Updated to include Gen 3 Mirage Island data and location-are-prose info
ItsMeJoji e976d60
Merge branch 'oras-mirage-spots' of https://github.com/ItsMeJoji/poke…
ItsMeJoji 96a8fe9
Resolve merge conflict in encounters.csv
ItsMeJoji 5058372
Removed personal changes in Makefile
ItsMeJoji 4b01dfa
Correct Wynaut Encounter Method
ItsMeJoji 2a31801
Flip Mirage Island Location IDs
ItsMeJoji ba311c4
Flipped Mirage Island names
ItsMeJoji 60db85e
Merge branch 'master' into oras-mirage-spots
ItsMeJoji 1a28475
Merge branch 'master' into oras-mirage-spots
ItsMeJoji 5a814be
Merge branch 'PokeAPI:master' into oras-mirage-spots
ItsMeJoji 8f4ecfc
ORAS Mirage Forest Encounters
ItsMeJoji 0672aa2
Merge branch 'PokeAPI:master' into oras-mirage-spots
ItsMeJoji File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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 | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -65316,3 +65316,55 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level | |||||||||||||||||||||
| 70875,7,1223,1358,360,5,50 | ||||||||||||||||||||||
| 70876,8,1223,1358,360,5,50 | ||||||||||||||||||||||
| 70877,9,1223,1359,360,5,50 | ||||||||||||||||||||||
| 70878,25,1224,1348,114,36,38 | ||||||||||||||||||||||
| 70879,25,1224,1349,191,36,38 | ||||||||||||||||||||||
| 70880,25,1224,1350,432,36,38 | ||||||||||||||||||||||
| 70881,25,1224,1351,421,36,38 | ||||||||||||||||||||||
| 70882,26,1224,1348,114,36,38 | ||||||||||||||||||||||
| 70883,26,1224,1349,191,36,38 | ||||||||||||||||||||||
| 70884,26,1224,1350,432,36,38 | ||||||||||||||||||||||
| 70885,26,1224,1351,421,36,38 | ||||||||||||||||||||||
| 70886,25,1225,1360,191,36,38 | ||||||||||||||||||||||
| 70887,25,1225,1361,548,36,38 | ||||||||||||||||||||||
| 70888,25,1225,1362,531,36,38 | ||||||||||||||||||||||
| 70889,26,1225,1360,191,36,38 | ||||||||||||||||||||||
| 70890,26,1225,1361,548,36,38 | ||||||||||||||||||||||
| 70891,26,1225,1362,531,36,38 | ||||||||||||||||||||||
| 70892,25,1226,1348,114,36,38 | ||||||||||||||||||||||
| 70893,25,1226,1349,191,36,38 | ||||||||||||||||||||||
| 70894,25,1226,1350,431,36,38 | ||||||||||||||||||||||
| 70895,25,1226,1351,572,36,38 | ||||||||||||||||||||||
| 70896,26,1226,1348,114,36,38 | ||||||||||||||||||||||
| 70897,26,1226,1349,191,36,38 | ||||||||||||||||||||||
| 70898,26,1226,1350,431,36,38 | ||||||||||||||||||||||
| 70899,26,1226,1351,572,36,38 | ||||||||||||||||||||||
| 70900,25,1227,1354,531,36,38 | ||||||||||||||||||||||
| 70901,25,1227,1355,191,36,38 | ||||||||||||||||||||||
| 70902,26,1227,1354,531,36,38 | ||||||||||||||||||||||
| 70903,26,1227,1355,191,36,38 | ||||||||||||||||||||||
| 70904,25,1228,1348,114,36,38 | ||||||||||||||||||||||
| 70905,25,1228,1349,191,36,38 | ||||||||||||||||||||||
| 70906,25,1228,1350,431,36,38 | ||||||||||||||||||||||
| 70907,25,1228,1351,37,36,38 | ||||||||||||||||||||||
| 70908,26,1228,1348,114,36,38 | ||||||||||||||||||||||
| 70909,26,1228,1349,191,36,38 | ||||||||||||||||||||||
| 70910,26,1228,1350,431,36,38 | ||||||||||||||||||||||
| 70911,26,1228,1351,37,36,38 | ||||||||||||||||||||||
| 70912,25,1229,1348,114,36,38 | ||||||||||||||||||||||
| 70913,25,1229,1349,191,36,38 | ||||||||||||||||||||||
| 70914,25,1229,1350,431,36,38 | ||||||||||||||||||||||
| 70915,25,1229,1351,548,36,38 | ||||||||||||||||||||||
| 70916,26,1229,1348,114,36,38 | ||||||||||||||||||||||
| 70917,26,1229,1349,191,36,38 | ||||||||||||||||||||||
| 70918,26,1229,1350,431,36,38 | ||||||||||||||||||||||
|
Comment on lines
+65355
to
+65359
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Purugly is available here, not Glameow |
||||||||||||||||||||||
| 70919,26,1229,1351,548,36,38 | ||||||||||||||||||||||
| 70920,25,1230,1352,205,36,38 | ||||||||||||||||||||||
| 70921,25,1230,1353,440,36,38 | ||||||||||||||||||||||
| 70922,26,1230,1352,205,36,38 | ||||||||||||||||||||||
| 70923,26,1230,1353,440,36,38 | ||||||||||||||||||||||
| 70924,25,1230,1363,75,36,38 | ||||||||||||||||||||||
| 70925,26,1230,1363,75,36,38 | ||||||||||||||||||||||
| 70926,25,1231,1352,402,36,38 | ||||||||||||||||||||||
| 70927,25,1231,1353,636,36,38 | ||||||||||||||||||||||
| 70928,26,1231,1352,402,36,38 | ||||||||||||||||||||||
| 70929,26,1231,1353,636,36,38 | ||||||||||||||||||||||
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Purugly is available here, not Glameow