Adding Gen 6 Ambush Encounters#1576
Conversation
jemarq04
left a comment
jemarq04
left a comment
There was a problem hiding this comment.
Looking through the encounters, there are quite a few off-by-one errors when it comes to the encounter methods (e.g. some ID 56 overworld-dirt that should be ID 57 trash-can). Once you fix these up, I'll take another look. Thanks!
| 18,gift,18 | ||
| 19,gift-egg,19 | ||
| 20,only-one,20 | ||
| 20,static-encounter,20 |
There was a problem hiding this comment.
| 20,static-encounter,20 | |
| 20,static,20 |
Maybe just 'static', since these are all methods for encountering pokemon.
There was a problem hiding this comment.
Okay, sounds good. I'll also change sos-encounter to just say sos to match as well.
There was a problem hiding this comment.
Hmm. I missed that lol. Well, if it wasn't consistent before, we can leave this as-is!
Edit: I worded this wrong, but basically if we have something else with 'encounter' in it then it's up to you
There was a problem hiding this comment.
Sorry, I changed it prematurely. I mean there's nothing really wrong with just sos, unless we don't want it being that vague.
There was a problem hiding this comment.
I think we likely had it named sos-encounter since it's called that in the games. I honestly think how it was (and how you renamed the static method) were probably fine as-is and I was overthinking the identifiers a bit. If you'd like to revert it, that would probably be better, but again it's up to you
Looks like I didn't take the previous method into account. I shifted everything up correctly. I'll push once I confirm it builds correctly and is set to the right methods. |
| 77031,23,724,1810,50,26,28 | ||
| 77032,23,724,1811,443,26,28 | ||
| 77033,24,724,1809,51,26,28 | ||
| 77034,24,724,1810,50,26,28 |
There was a problem hiding this comment.
| 77031,23,724,1810,50,26,28 | |
| 77032,23,724,1811,443,26,28 | |
| 77033,24,724,1809,51,26,28 | |
| 77034,24,724,1810,50,26,28 | |
| 77031,23,724,1810,328,26,28 | |
| 77032,23,724,1811,443,26,28 | |
| 77033,24,724,1809,51,26,28 | |
| 77034,24,724,1810,328,26,28 |
Diglett should be Trapinch in Kalos Route 13
There was a problem hiding this comment.
I have no words on how I mixed that one up. Lol. Ty for catching...
There was a problem hiding this comment.
It happens! I was skimming through and saw Diglett come up and I went... wait... lol
| 77014,23,738,1805,527,21,23 | ||
| 77015,23,738,1806,597,21,23 | ||
| 77016,23,739,1805,527,21,23 | ||
| 77017,23,739,1806,597,21,23 | ||
| 77018,23,740,1805,527,21,23 | ||
| 77019,23,740,1806,597,21,23 | ||
| 77020,23,741,1805,527,21,23 | ||
| 77021,23,741,1806,597,21,23 | ||
| 77022,24,738,1805,527,21,23 | ||
| 77023,24,738,1806,597,21,23 | ||
| 77024,24,739,1805,527,21,23 | ||
| 77025,24,739,1806,597,21,23 | ||
| 77026,24,740,1805,527,21,23 | ||
| 77027,24,740,1806,597,21,23 | ||
| 77028,24,741,1805,527,21,23 | ||
| 77029,24,741,1806,597,21,23 |
There was a problem hiding this comment.
| 77014,23,738,1805,527,21,23 | |
| 77015,23,738,1806,597,21,23 | |
| 77016,23,739,1805,527,21,23 | |
| 77017,23,739,1806,597,21,23 | |
| 77018,23,740,1805,527,21,23 | |
| 77019,23,740,1806,597,21,23 | |
| 77020,23,741,1805,527,21,23 | |
| 77021,23,741,1806,597,21,23 | |
| 77022,24,738,1805,527,21,23 | |
| 77023,24,738,1806,597,21,23 | |
| 77024,24,739,1805,527,21,23 | |
| 77025,24,739,1806,597,21,23 | |
| 77026,24,740,1805,527,21,23 | |
| 77027,24,740,1806,597,21,23 | |
| 77028,24,741,1805,527,21,23 | |
| 77029,24,741,1806,597,21,23 | |
| 77014,23,738,1805,527,21,23 | |
| 77015,23,738,1806,597,21,23 | |
| 77022,24,738,1805,527,21,23 | |
| 77023,24,738,1806,597,21,23 |
Bulbapedia doesn't differentiate between different location areas as much for these encounters I'm noticing, but on Serebii the ambush encounters can only happen in the first area (1F). Every other area has identical encounters so it's hard to differentiate them in our API, so let's assume 738 (reflection-cave-unknown-area-305) is our 1F area and remove the ambush encounters in the others.
At some point I'd like these "unknown area" identifiers to be renamed, but for now we can continue on. I've noticed that the order of the "unknown area" areas seem to match those in Serebii, so if you'd like to rename ones you added encounters to, feel free. Otherwise we can always fix that later on, so don't feel like you need to!
There was a problem hiding this comment.
That's fine with me. I'll cross-reference with Serebii more often.
Seems odd to only code the encounters for a single floor of a location, so I might do some digging later, in case we need to add them back in.
There was a problem hiding this comment.
Yeah it's unclear to me if Serebii is missing them for the B1F-B3F areas or if we really only need it for 1F. If they really are present on each floor then we should leave your encounters for this location as-is
Adding missing `type-` to condition values. Co-authored-by: Justin Marquez <37006684+jemarq04@users.noreply.github.com>
2 participants
Change description
This PR consists of the X and Y Ambush encounters that were missing.
This includes additions of new Encounters, Encounter Methods, and Encounter Conditions.
This would close Issue #1454.
AI coding assistance disclosure
No AI was used in adding these.
Contributor check list