Merge branch 'master' into images

README.md

@@ -1,8 +1,9 @@
 Universal Pokemon Randomizer ZX - V branch/images
 
-Continuously based on the UPR ZX, by Ajarmar, with significant contributions from darkeye, cleartonic.
-Based on the Universal Pokemon Randomizer by Dabomstew.
-Palette randomization based off work by Artemis251.
+Continuously based on the UPR ZX, by Ajarmar, with significant contributions from darkeye, cleartonic,
+in turn based on the Universal Pokemon Randomizer by Dabomstew
+
+Palette randomization based off work by Artemis251, contains several features from [foxoftheasterisk/UPR-ZX-closer-to-vanilla](https://github.com/foxoftheasterisk/UPR-ZX-closer-to-vanilla).
 
 V branch/images maintained by voliol
 
@@ -14,13 +15,17 @@ This is an experimental branch for various image-related operations, such as cha
 
 # Branch Info
 
+This is an alternate branch of the [UPR ZX](https://github.com/Ajarmar/universal-pokemon-randomizer-zx). Its goal is to be kept up with the main branch of ZX, while adding features such as palette randomization, and a bunch of refactoring for ease-of-development.
+
 I do not have the tools/computer to be able to handle games past Gen V. For this reason, while later generation support will be merged in from the main branch, I cannot guarantee V branch features will mesh with those generations un-buggily. And features that need generation-specific implementations simply won't make it past Gen V.  
 
+The only _known_ break is with encounters/wild Pokémon in ORAS. Said game had some special handling which had to be taken out when rewriting encounter code, and it has not been put back in.
+
 # Contributing
 
 If you want to contribute something to the codebase, I recommend creating an issue for it first (using the`Contribution Idea` template). This way, we can discuss how to accomplish this, and possibly whether it's a good fit for the randomizer. My plan is to have a more laissez-faire attitute compared to the main ZX branch, so as long as it doesn't mess up the main UI/usability it should be fine. 
 
-[The main branch Wiki Page](https://github.com/Ajarmar/universal-pokemon-randomizer-zx/wiki/Building-Universal-Pokemon-Randomizer-ZX) explains how to set up to build/test locally, with the caveat that the V branch runs of Java 18.
+[The main branch Wiki Page](https://github.com/Ajarmar/universal-pokemon-randomizer-zx/wiki/Building-Universal-Pokemon-Randomizer-ZX) explains how to set up to build/test locally, with the caveat that the V branch runs off Java 18.
 
 ### What is a good fit for the randomizer?