ORAS Mirage Spots - Cave and Mountain Encounters

[ItsMeJoji]

Final ORAS Mirage Spot encounter for Mirage Cave and Mirage Mountain.

I believe there's a commit @notblisy is working on that affects files I'm pushing, so we can confirm and pull their PR before mine. Once theirs's is approved, I'll sync up mine.

[notblisy]

Thanks for the grace @ItsMeJoji. I actually have a question! It looks like you made this an upstream of the mirage forest PR you initially made. I tried to do that with my XD pr with the Colo one I made, but after my Colo pr got merged it said my branch was incompatible.

I think GitHub for some reason thought all my previous commits were different? Can you describe how you did this upstream?

[jemarq04]

I did the review in this PR first as it seemed a bit smaller, but we can definitely hold off on merging until the XD PR is complete.

Just a minor fix for the level of Graveler - thanks for keeping things in a nice order so it's easy to review! :)

[jemarq04]

Github won't let me resolve the comments, but the PR is good to go once the XD PR is merged

[ItsMeJoji]

Resolved them on my end. Now the issue is that the Mirage Forest and Mirage Island Graveler encounters are also wrong... 😔

https://bulbapedia.bulbagarden.net/wiki/Mirage_Island_(south_of_Pacifidlog_Town)

https://bulbapedia.bulbagarden.net/wiki/Mirage_Forest_(west_of_Route_105)

[jemarq04]

Resolved them on my end. Now the issue is that the Mirage Forest and Mirage Island Graveler encounters are also wrong... 😔

https://bulbapedia.bulbagarden.net/wiki/Mirage_Island_(south_of_Pacifidlog_Town)

https://bulbapedia.bulbagarden.net/wiki/Mirage_Forest_(west_of_Route_105)

😭 Well.. at least that should be a fairly straightforward PR lol

[ItsMeJoji]

Resolved them on my end. Now the issue is that the Mirage Forest and Mirage Island Graveler encounters are also wrong... 😔
https://bulbapedia.bulbagarden.net/wiki/Mirage_Island_(south_of_Pacifidlog_Town)
https://bulbapedia.bulbagarden.net/wiki/Mirage_Forest_(west_of_Route_105)

😭 Well.. at least that should be a fairly straightforward PR lol

I'm gonna do a quick change from Github. It's like 4 lines.

[ItsMeJoji]

No clue why Mirage Forest is a lower minimum range, but definitely 33.

[jemarq04]

No clue why Mirage Forest is a lower minimum range, but definitely 33.

Looks like Bulbapedia is the best guide for the mirage spots: It shows 33-38 for Graveler for mirage forest. https://bulbapedia.bulbagarden.net/wiki/Mirage_Forest_(west_of_Route_105)

[ItsMeJoji]

Thanks for the grace @ItsMeJoji. I actually have a question! It looks like you made this an upstream of the mirage forest PR you initially made. I tried to do that with my XD pr with the Colo one I made, but after my Colo pr got merged it said my branch was incompatible.

I think GitHub for some reason thought all my previous commits were different? Can you describe how you did this upstream?

Sorry about skipping this earlier @notblisy .

What I did was after my PR was merged, I just synced my oras branch to the latest PokeAPI master via Github. From there, I pulled the latest into my IDE and continued my work there. I don't think I did anything else.

[notblisy]

Ah okay, this makes sense. I think I didn't sync my branch before adding the XD info in. I'll try this when I start working on the trade encounters since that'll be like 7+ PRs.

Thanks!