Restrict gender options if species is exclusively male, female or genderless

.gitattributes

@@ -1,6 +1,2 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
-# These are explicitly windows files and should use crlf
 *.bat           text eol=crlf
-
+src/main/resources/dashboard/scripts/pokedata.js linguist-vendored

README.md

@@ -1,5 +1,6 @@
 # Entralinked
 [![build](https://github.com/kuroppoi/entralinked/actions/workflows/dist-upload-artifact.yml/badge.svg)](https://github.com/kuroppoi/entralinked/actions)
+[![release](https://img.shields.io/github/v/release/kuroppoi/entralinked?labelColor=30373D&label=Release&logoColor=959DA5&logo=github)](https://github.com/kuroppoi/entralinked/releases/latest)
 
 Entralinked is a standalone Game Sync emulator developed for use with Pokémon Black & White and its sequels.\
 Its purpose is to serve as a simple utility for downloading Pokémon, Items, C-Gear skins, Pokédex skins, Musicals\
@@ -28,5 +29,5 @@ Entralinked has a built-in DNS server.\
 In order for your game to connect, you must configure the DNS settings of your DS.\
 By default, Entralinked is configured to automatically use the local host of the system.\
 This approach is not always accurate, however, and you may need to manually configure it in `config.json`.\
-If you receive error code `60000` when trying to connect, erase the Nintendo WFC Configuration of your DS and try again.\
-After tucking in a Pokémon, navigate to `http://localhost/dashboard/profile.html` in a web browser to configure Game Sync settings.
+If you receive error code `60000` when trying to connect, erase the WFC Configuration of your DS and try again.\
+After tucking in a Pokémon, navigate to http://localhost/dashboard/profile.html to configure Game Sync settings.

src/main/java/entralinked/model/pkmn/PkmnInfo.java

@@ -7,17 +7,18 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * Record containing information about a Pokémon
  */
 public record PkmnInfo(
-        @JsonProperty(required = true) int personality,
-        @JsonProperty(required = true) int species,
-        @JsonProperty(required = true) int heldItem,
-        @JsonProperty(required = true) int trainerId,
-        @JsonProperty(required = true) int trainerSecretId,
-        @JsonProperty(required = true) int level,
-        @JsonProperty(required = true) int form,
-        @JsonProperty(required = true) PkmnNature nature,
-        @JsonProperty(required = true) PkmnGender gender,
-        @JsonProperty(required = true) String nickname,
-        @JsonProperty(required = true) String trainerName) {
+        @JsonProperty(required = true)  String nickname,
+        @JsonProperty(required = true)  String trainerName,
+        @JsonProperty(required = true)  PkmnNature nature,
+        @JsonProperty(required = true)  PkmnGender gender,
+        @JsonProperty(required = true)  int species,
+        @JsonProperty(required = true)  int personality,
+        @JsonProperty(required = true)  int trainerId,
+        @JsonProperty(required = true)  int trainerSecretId,
+        @JsonProperty(required = true)  int level,
+        @JsonProperty(required = false) int form,
+        @JsonProperty(required = false) int ability,
+        @JsonProperty(required = false) int heldItem) {
     
     @JsonIgnore
     public boolean isShiny() {

src/main/java/entralinked/model/pkmn/PkmnInfoReader.java

@@ -58,7 +58,7 @@ public class PkmnInfoReader {
         
         // Read Pokémon data
         int species = buffer.getShortLE(8);
-        int item = buffer.getShortLE(10) & 0xFFFF;
+        int heldItem = buffer.getShortLE(10) & 0xFFFF;
         int trainerId = buffer.getShortLE(12) & 0xFFFF;
         int trainerSecretId = buffer.getShortLE(14) & 0xFFFF;
         int level = buffer.getByte(140);
@@ -78,14 +78,14 @@ public class PkmnInfoReader {
         
         // Loosely verify data
         if(species < 1 || species > 649) throw new IOException("Invalid species");
-        if(item < 0 || item > 638) throw new IOException("Invalid held item");
+        if(heldItem < 0 || heldItem > 638) throw new IOException("Invalid held item");
         if(ability < 1 || ability > 164) throw new IOException("Invalid ability");
         if(level < 1 || level > 100) throw new IOException("Level is out of range");
         if(nature == null) throw new IOException("Invalid nature");
         
         // Create record
-        PkmnInfo info = new PkmnInfo(personality, species, item, trainerId, trainerSecretId, level, form, nature, gender, nickname, trainerName);
-        return info;
+        return new PkmnInfo(nickname, trainerName, nature, gender, species, personality,
+                trainerId, trainerSecretId, level, form, ability, heldItem);
     }
     
     private static void decryptData(ByteBuf buffer, int offset, int length, int seed) throws IOException {

src/main/java/entralinked/utility/TiledImageReader.java

@@ -4,6 +4,9 @@ import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 /**
  * Utility class for reading tiled images (C-Gear & Pokédex skin data) into a usable {@link BufferedImage}.
  */
@@ -15,44 +18,72 @@ public class TiledImageReader {
     public static final int COLOR_PALETTE_SIZE = 16;
     public static final int SCREEN_WIDTH = 256;
     public static final int SCREEN_HEIGHT = 192;
-    public static final int SCREEN_TILE_COUNT = SCREEN_WIDTH * SCREEN_HEIGHT / TILE_SIZE;
+    public static final int SCREEN_SIZE = SCREEN_WIDTH * SCREEN_HEIGHT;
+    public static final int SCREEN_TILE_COUNT = SCREEN_SIZE / TILE_SIZE;
+    private static final byte[] dexBackgroundColorIndices = new byte[SCREEN_SIZE];
+    private static final Logger logger = LogManager.getLogger();
+    
+    static {
+        // Load Pokédex skin background color indices
+        try(InputStream inputStream = TiledImageReader.class.getResourceAsStream("/zukan.bin")) {
+            int currentIndex = 0;
+            int valueAmount = -1;
+            int value = -1;
+            
+            // Read until end of stream
+            while((valueAmount = inputStream.read()) != -1 && (value = inputStream.read()) != -1) {
+                for(int i = 0; i < valueAmount; i++) {
+                    dexBackgroundColorIndices[currentIndex++] = (byte)(value & 63);
+                }
+            }
+        } catch(IOException e) {
+            logger.error("Could not load Pokédex background data", e);
+        }
+    }
     
     /**
-     * Calls {@link #readTiledImage(InputStream, int, boolean)} with a tile count of 255.
+     * Reads a C-Gear skin from the specified {@link InputStream}.
      * 
      * @param normalizeIndices Should be {@code true} if the provided C-Gear skin data is from the original Black & White.
      * @return A {@link BufferedImage} representing the read C-Gear skin data.
      */
     public static BufferedImage readCGearSkin(InputStream inputStream, boolean normalizeIndices) throws IOException {
-        return readTiledImage(inputStream, 255, normalizeIndices);
+        return readTiledImage(inputStream, 255, 0, null, normalizeIndices);
     }
     
     /**
-     * Calls {@link #readTiledImage(InputStream, int, boolean)} with a tile count of 768 and index normalization disabled.
+     * Reads a Pokédex skin from the specified {@link InputStream}.
+     * If the skin in question is an overlay, the Pokédex background will be applied to the resulting image automatically.
      * 
      * @return A {@link BufferedImage} representing the read Pokédex skin data.
      */
     public static BufferedImage readDexSkin(InputStream inputStream) throws IOException {
-        return readTiledImage(inputStream, 768, false);
+        return readTiledImage(inputStream, 768, 64, dexBackgroundColorIndices, false);
     }
     
     /**
      * Reads tiled image data from the provided {@link InputStream} and returns a {@link BufferedImage} representing the read image data.
      * 
      * @param tileCount The number of tiles to be read. This should be equal to the maximum number of tiles for this image.
+     * @param backgroundColorCount The number of background colors this image has.
+     * @param backgroundColorIndices The background color indices of the background image. If {@code null}, no background will be used.
      * @param normalizedIndices Indicates that tile indices are not linear (Black & White C-Gear skins) and should be normalized.
      * @return A {@link BufferedImage} representing the read image data.
      */
-    public static BufferedImage readTiledImage(InputStream inputStream, int tileCount, boolean normalizeIndices) throws IOException {
+    public static BufferedImage readTiledImage(InputStream inputStream, int tileCount, int backgroundColorCount,
+            byte[] backgroundColorIndices, boolean normalizeIndices) throws IOException {
         BufferedImage image = new BufferedImage(SCREEN_WIDTH, SCREEN_HEIGHT, BufferedImage.TYPE_INT_RGB); // Result image
         int[] tileData = new int[tileCount * TILE_SIZE];
         int[] tileIndices = new int[tileCount]; // Tile index lookup table
         int[] colorPalette = new int[COLOR_PALETTE_SIZE];
+        int[] backgroundColorPalette = new int[backgroundColorCount];
         
         // Read tile data.
         for(int i = 0; i < tileCount; i++) {
-            for(int j = 0; j < TILE_SIZE / 2; j++) {
-                int paletteIndices = inputStream.read(); // Contains color palette indices for 2 adjacent pixels.
+            byte[] rawTileData = inputStream.readNBytes(TILE_SIZE / 2);
+            
+            for(int j = 0; j < rawTileData.length; j++) {
+                int paletteIndices = rawTileData[j]; // Contains color palette indices for 2 adjacent pixels.
                 tileData[i * TILE_SIZE + j * 2] = paletteIndices & (COLOR_PALETTE_SIZE - 1);
                 tileData[i * TILE_SIZE + j * 2 + 1] = (paletteIndices >> 4) & (COLOR_PALETTE_SIZE - 1);
             }
@@ -61,17 +92,18 @@ public class TiledImageReader {
             tileIndices[i] = normalizeIndices ? i + i / 17 * 15 + 0xA0A0 : i;
         }
         
-        // Read color data.
+        // Read foreground color data.
+        // In cases where background colors are present, pixels that use the *first* foreground color
+        // will be replaced by the background color at that pixel's location.
+        for(int i = 0; i < COLOR_PALETTE_SIZE; i++) {
+            colorPalette[i] = convertColor(inputStream.read() | inputStream.read() << 8);
+        }
+        
+        // Read background color data.
         // Pokédex skins contain room for 240 extra colors, 64 of which are defined and appear to be used as the 
         // 'background' colors in cases where the skin is only an overlay that is displayed on top of the 'true' Pokédex.
-        for(int i = 0; i < COLOR_PALETTE_SIZE; i++) {
-            int color = inputStream.read() | inputStream.read() << 8;
-            
-            // Convert BGR555 to RGB888
-            int red = (color & 0x1F) << 3;
-            int green = ((color & 0x3E0) >> 5) << 3;
-            int blue = ((color & 0x7C00) >> 10) << 3;
-            colorPalette[i] = (red << 16) | (green << 8) | blue;
+        for(int i = 0; i < backgroundColorCount; i++) {
+            backgroundColorPalette[i] = convertColor(inputStream.read() | inputStream.read() << 8);
         }
         
         // Map tiles to the resulting image.
@@ -107,10 +139,18 @@ public class TiledImageReader {
                         case 12 -> TILE_SIZE - j - 1; // Flip horizontally & vertically
                         default -> j; // Don't flip
                     };
-                                        
-                    // Finally, set the pixel!
+                    
+                    int pixelX = x + j % TILE_WIDTH;
+                    int pixelY = y + j / TILE_WIDTH;
                     int paletteIndex = tileData[tileIndex * TILE_SIZE + tilePixelIndex];
-                    image.setRGB(x + j % TILE_WIDTH, y + j / TILE_WIDTH, colorPalette[paletteIndex]);
+                    
+                    // If a background is present and the foreground color index of this pixel is 0, use the background color instead.
+                    // The background color index is determined by the pixel location.
+                    int color = backgroundColorIndices == null || paletteIndex > 0 ? colorPalette[paletteIndex]
+                            : backgroundColorPalette[backgroundColorIndices[pixelY * SCREEN_WIDTH + pixelX]];
+                    
+                    // Finally, set the pixel!
+                    image.setRGB(pixelX, pixelY, color);
                 }
             }
         } else {
@@ -120,11 +160,28 @@ public class TiledImageReader {
                 int y = i * TILE_WIDTH / SCREEN_WIDTH * TILE_WIDTH;
                 
                 for(int j = 0; j < TILE_SIZE; j++) {
-                    image.setRGB(x + j % TILE_WIDTH, y + j / TILE_WIDTH, colorPalette[tileData[i * TILE_SIZE + j]]);
+                    int pixelX = x + j % TILE_WIDTH;
+                    int pixelY = y + j / TILE_WIDTH;
+                    int paletteIndex = tileData[i * TILE_SIZE + j];
+                    int color = backgroundColorIndices == null || paletteIndex > 0 ? colorPalette[paletteIndex]
+                            : backgroundColorPalette[backgroundColorIndices[pixelY * SCREEN_WIDTH + pixelX]];
+                    image.setRGB(pixelX, pixelY, color);
                 }
             }
         }
         
         return image;
     }
+    
+    /**
+     * Converts the input BGR555 color value to an RGB888 color value.
+     * 
+     * @return The RGB888 color value.
+     */
+    private static int convertColor(int color) {
+        int red = (color & 0x1F) << 3;
+        int green = ((color & 0x3E0) >> 5) << 3;
+        int blue = ((color & 0x7C00) >> 10) << 3;
+        return (red << 16) | (green << 8) | blue;
+    }
 }

src/main/resources/dashboard/profile.html

@@ -21,24 +21,26 @@
             <tr>
               <th>Species</th>
               <td id="dreamer-species"></td>
-              <th>Nature</th>
-              <td id="dreamer-nature"></td>
+              <th>Ability</th>
+              <td id="dreamer-ability"></td>
             </tr>
             <tr>
               <th>Name</th>
               <td id="dreamer-name"></td>
-              <th>Gender</th>
-              <td id="dreamer-gender"></td>
+              <th>Nature</th>
+              <td id="dreamer-nature"></td>
             </tr>
             <tr>
               <th>Trainer</th>
               <td id="dreamer-trainer"></td>
-              <th>Level</th>
-              <td id="dreamer-level"></td>
+              <th>Gender</th>
+              <td id="dreamer-gender"></td>
             </tr>
             <tr>
               <th>Trainer ID</th>
               <td id="dreamer-trainer-id"></td>
+              <th>Level</th>
+              <td id="dreamer-level"></td>
             </tr>
           </table>
         </div>
@@ -48,18 +50,18 @@
           <div>
             <table id="encounter-table" class="encounter-image-table">
               <tr>
-                <td><a id="encounter0" href="#configureEncounter" onclick="configureEncounter(0)"><image src="/sprites/pokemon/normal/0.png"/></a></td>
-                <td><a id="encounter1" href="#configureEncounter" onclick="configureEncounter(1)"><image src="/sprites/pokemon/normal/0.png"/></a></td>
-                <td><a id="encounter2" href="#configureEncounter" onclick="configureEncounter(2)"><image src="/sprites/pokemon/normal/0.png"/></a></td>
-                <td><a id="encounter3" href="#configureEncounter" onclick="configureEncounter(3)"><image src="/sprites/pokemon/normal/0.png"/></a></td>
-                <td><a id="encounter4" href="#configureEncounter" onclick="configureEncounter(4)"><image src="/sprites/pokemon/normal/0.png"/></a></td>
+                <td id="encounter0" onclick="configureEncounter(0)"><image src="/sprites/pokemon/normal/0.png"/></td>
+                <td id="encounter1" onclick="configureEncounter(1)"><image src="/sprites/pokemon/normal/0.png"/></td>
+                <td id="encounter2" onclick="configureEncounter(2)"><image src="/sprites/pokemon/normal/0.png"/></td>
+                <td id="encounter3" onclick="configureEncounter(3)"><image src="/sprites/pokemon/normal/0.png"/></td>
+                <td id="encounter4" onclick="configureEncounter(4)"><image src="/sprites/pokemon/normal/0.png"/></td>
               </tr>
               <tr>
-                <td><a id="encounter5" href="#configureEncounter" onclick="configureEncounter(5)"><image src="/sprites/pokemon/normal/0.png"/></a></td>
-                <td><a id="encounter6" href="#configureEncounter" onclick="configureEncounter(6)"><image src="/sprites/pokemon/normal/0.png"/></a></td>
-                <td><a id="encounter7" href="#configureEncounter" onclick="configureEncounter(7)"><image src="/sprites/pokemon/normal/0.png"/></a></td>
-                <td><a id="encounter8" href="#configureEncounter" onclick="configureEncounter(8)"><image src="/sprites/pokemon/normal/0.png"/></a></td>
-                <td><a id="encounter9" href="#configureEncounter" onclick="configureEncounter(9)"><image src="/sprites/pokemon/normal/0.png"/></a></td>
+                <td id="encounter5" onclick="configureEncounter(5)"><image src="/sprites/pokemon/normal/0.png"/></td>
+                <td id="encounter6" onclick="configureEncounter(6)"><image src="/sprites/pokemon/normal/0.png"/></td>
+                <td id="encounter7" onclick="configureEncounter(7)"><image src="/sprites/pokemon/normal/0.png"/></td>
+                <td id="encounter8" onclick="configureEncounter(8)"><image src="/sprites/pokemon/normal/0.png"/></td>
+                <td id="encounter9" onclick="configureEncounter(9)"><image src="/sprites/pokemon/normal/0.png"/></td>
               </tr>
             </table>
           </div>
@@ -70,20 +72,20 @@
           <div>
             <table id="visitor-table" class="visitor-table">
               <tr>
-                <td><a id="visitor0" href="#configureVisitor" onclick="configureVisitor(0)"><image src="/sprites/trainers/none.png"/></a></td>
-                <td><a id="visitor1" href="#configureVisitor" onclick="configureVisitor(1)"><image src="/sprites/trainers/none.png"/></a></td>
-                <td><a id="visitor2" href="#configureVisitor" onclick="configureVisitor(2)"><image src="/sprites/trainers/none.png"/></a></td>
-                <td><a id="visitor3" href="#configureVisitor" onclick="configureVisitor(3)"><image src="/sprites/trainers/none.png"/></a></td>
-                <td><a id="visitor4" href="#configureVisitor" onclick="configureVisitor(4)"><image src="/sprites/trainers/none.png"/></a></td>
-                <td><a id="visitor5" href="#configureVisitor" onclick="configureVisitor(5)"><image src="/sprites/trainers/none.png"/></a></td>
+                <td id="visitor0" onclick="configureVisitor(0)"><image src="/sprites/trainers/none.png"/></td>
+                <td id="visitor1" onclick="configureVisitor(1)"><image src="/sprites/trainers/none.png"/></td>
+                <td id="visitor2" onclick="configureVisitor(2)"><image src="/sprites/trainers/none.png"/></td>
+                <td id="visitor3" onclick="configureVisitor(3)"><image src="/sprites/trainers/none.png"/></td>
+                <td id="visitor4" onclick="configureVisitor(4)"><image src="/sprites/trainers/none.png"/></td>
+                <td id="visitor5" onclick="configureVisitor(5)"><image src="/sprites/trainers/none.png"/></td>
               </tr>
               <tr>
-                <td><a id="visitor6" href="#configureVisitor" onclick="configureVisitor(6)"><image src="/sprites/trainers/none.png"/></a></td>
-                <td><a id="visitor7" href="#configureVisitor" onclick="configureVisitor(7)"><image src="/sprites/trainers/none.png"/></a></td>
-                <td><a id="visitor8" href="#configureVisitor" onclick="configureVisitor(8)"><image src="/sprites/trainers/none.png"/></a></td>
-                <td><a id="visitor9" href="#configureVisitor" onclick="configureVisitor(9)"><image src="/sprites/trainers/none.png"/></a></td>
-                <td><a id="visitor10" href="#configureVisitor" onclick="configureVisitor(10)"><image src="/sprites/trainers/none.png"/></a></td>
-                <td><a id="visitor11" href="#configureVisitor" onclick="configureVisitor(11)"><image src="/sprites/trainers/none.png"/></a></td>
+                <td id="visitor6" onclick="configureVisitor(6)"><image src="/sprites/trainers/none.png"/></td>
+                <td id="visitor7" onclick="configureVisitor(7)"><image src="/sprites/trainers/none.png"/></td>
+                <td id="visitor8" onclick="configureVisitor(8)"><image src="/sprites/trainers/none.png"/></td>
+                <td id="visitor9" onclick="configureVisitor(9)"><image src="/sprites/trainers/none.png"/></td>
+                <td id="visitor10" onclick="configureVisitor(10)"><image src="/sprites/trainers/none.png"/></td>
+                <td id="visitor11" onclick="configureVisitor(11)"><image src="/sprites/trainers/none.png"/></td>
               </tr>
             </table>
           </div>
@@ -94,28 +96,28 @@
           <div>
             <table id="item-table" class="item-table">
               <tr>
-                <td><a id="item0" href="#configureItem" onclick="configureItem(0)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item1" href="#configureItem" onclick="configureItem(1)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item2" href="#configureItem" onclick="configureItem(2)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item3" href="#configureItem" onclick="configureItem(3)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item4" href="#configureItem" onclick="configureItem(4)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item5" href="#configureItem" onclick="configureItem(5)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item6" href="#configureItem" onclick="configureItem(6)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item7" href="#configureItem" onclick="configureItem(7)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item8" href="#configureItem" onclick="configureItem(8)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item9" href="#configureItem" onclick="configureItem(9)"><image src="/sprites/items/0.png"/></a></td>
+                <td id="item0" onclick="configureItem(0)"><image src="/sprites/items/0.png"/></td>
+                <td id="item1" onclick="configureItem(1)"><image src="/sprites/items/0.png"/></td>
+                <td id="item2" onclick="configureItem(2)"><image src="/sprites/items/0.png"/></td>
+                <td id="item3" onclick="configureItem(3)"><image src="/sprites/items/0.png"/></td>
+                <td id="item4" onclick="configureItem(4)"><image src="/sprites/items/0.png"/></td>
+                <td id="item5" onclick="configureItem(5)"><image src="/sprites/items/0.png"/></td>
+                <td id="item6" onclick="configureItem(6)"><image src="/sprites/items/0.png"/></td>
+                <td id="item7" onclick="configureItem(7)"><image src="/sprites/items/0.png"/></td>
+                <td id="item8" onclick="configureItem(8)"><image src="/sprites/items/0.png"/></td>
+                <td id="item9" onclick="configureItem(9)"><image src="/sprites/items/0.png"/></td>
               </tr>
               <tr>
-                <td><a id="item10" href="#configureItem" onclick="configureItem(10)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item11" href="#configureItem" onclick="configureItem(11)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item12" href="#configureItem" onclick="configureItem(12)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item13" href="#configureItem" onclick="configureItem(13)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item14" href="#configureItem" onclick="configureItem(14)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item15" href="#configureItem" onclick="configureItem(15)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item16" href="#configureItem" onclick="configureItem(16)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item17" href="#configureItem" onclick="configureItem(17)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item18" href="#configureItem" onclick="configureItem(18)"><image src="/sprites/items/0.png"/></a></td>
-                <td><a id="item19" href="#configureItem" onclick="configureItem(19)"><image src="/sprites/items/0.png"/></a></td>
+                <td id="item10" onclick="configureItem(10)"><image src="/sprites/items/0.png"/></td>
+                <td id="item11" onclick="configureItem(11)"><image src="/sprites/items/0.png"/></td>
+                <td id="item12" onclick="configureItem(12)"><image src="/sprites/items/0.png"/></td>
+                <td id="item13" onclick="configureItem(13)"><image src="/sprites/items/0.png"/></td>
+                <td id="item14" onclick="configureItem(14)"><image src="/sprites/items/0.png"/></td>
+                <td id="item15" onclick="configureItem(15)"><image src="/sprites/items/0.png"/></td>
+                <td id="item16" onclick="configureItem(16)"><image src="/sprites/items/0.png"/></td>
+                <td id="item17" onclick="configureItem(17)"><image src="/sprites/items/0.png"/></td>
+                <td id="item18" onclick="configureItem(18)"><image src="/sprites/items/0.png"/></td>
+                <td id="item19" onclick="configureItem(19)"><image src="/sprites/items/0.png"/></td>
               </tr>
             </table>
           </div>
@@ -155,9 +157,9 @@
           <button id="logout" class="big-button" onclick="postLogout()">Log Out</button>
         </div>
       </div>
-	  </div>
+    </div>
     <!-- Entree Forest Encounter Configuration Form -->
-    <div id="configureEncounter" class="popup">
+    <div id="encounter-config" class="popup">
       <div class="content">
         <button class="close-button" onclick="closeEncounterForm()">X</button>
         <form id="encounter-form">
@@ -172,7 +174,7 @@
           </select>
           <label for="encounter-form-form">Form</label>
           <select id="encounter-form-form" name="form" value="0">
-            <option value="0">Normal</option>
+            <option value="0">N/A</option>
             <!-- Filled by profile.js -->
           </select>
           <label for="encounter-form-gender">Gender</label>
@@ -198,9 +200,9 @@
       </div>
     </div>
     <!-- Item Configuration Form -->
-    <div id="configureItem" class="popup">
+    <div id="item-config" class="popup">
       <div class="content">
-        <button class="close-button" onclick="closeEncounterForm()">X</button>
+        <button class="close-button" onclick="closeItemForm()">X</button>
         <form id="item-form">
           <label for="item-form-id">Item</label>
           <select id="item-form-id" name="id" value="1">
@@ -214,7 +216,7 @@
       </div>
     </div>
     <!-- Join Avenue Visitor Configuration Form -->
-    <div id="configureVisitor" class="popup">
+    <div id="visitor-config" class="popup">
       <div class="content">
         <button class="close-button" onclick="closeVisitorForm()">X</button>
         <form id="visitor-form">
@@ -256,6 +258,15 @@
             <option value="BLACK_2_ENGLISH">Black Version 2</option>
             <option value="WHITE_2_ENGLISH">White Version 2</option>
           </select>
+          <label for="visitor-form-region">Country</label>
+          <select id="visitor-form-region" name="region" value="1">
+            <!-- Filled by profile.js -->
+          </select>
+          <label for="visitor-form-subregion">State/Province</label>
+          <select id="visitor-form-subregion" name="subregion" value="0">
+            <option value="0">N/A</option>
+            <!-- Filled by profile.js -->
+          </select>
           <label for="visitor-form-personality">Personality (Affects phrases used)</label>
           <input id="visitor-form-personality" name="personality" type="number" value="0" min="0" max="7"/>
           <label for="visitor-form-dreamer">Tucked-in Pokémon Species</label>

src/main/resources/dashboard/scripts/profile.js

@@ -3,6 +3,7 @@ const ELEMENT_GAME_SUMMARY = document.getElementById("game-summary");
 
 const ELEMENT_DREAMER_SPRITE = document.getElementById("dreamer-sprite");
 const ELEMENT_DREAMER_SPECIES = document.getElementById("dreamer-species");
+const ELEMENT_DREAMER_ABILITY = document.getElementById("dreamer-ability");
 const ELEMENT_DREAMER_NATURE = document.getElementById("dreamer-nature");
 const ELEMENT_DREAMER_NAME = document.getElementById("dreamer-name");
 const ELEMENT_DREAMER_GENDER = document.getElementById("dreamer-gender");
@@ -10,19 +11,24 @@ const ELEMENT_DREAMER_TRAINER = document.getElementById("dreamer-trainer");
 const ELEMENT_DREAMER_TRAINER_ID = document.getElementById("dreamer-trainer-id");
 const ELEMENT_DREAMER_LEVEL = document.getElementById("dreamer-level");
 
+const ELEMENT_ENCOUNTER_CONFIG = document.getElementById("encounter-config");
 const ELEMENT_ENCOUNTER_SPECIES = document.getElementById("encounter-form-species");
 const ELEMENT_ENCOUNTER_MOVE = document.getElementById("encounter-form-move");
 const ELEMENT_ENCOUNTER_FORM = document.getElementById("encounter-form-form");
 const ELEMENT_ENCOUNTER_GENDER = document.getElementById("encounter-form-gender");
 const ELEMENT_ENCOUNTER_ANIMATION = document.getElementById("encounter-form-animation");
 
+const ELEMENT_ITEM_CONFIG = document.getElementById("item-config");
 const ELEMENT_ITEM_ID = document.getElementById("item-form-id");
 const ELEMENT_ITEM_QUANTITY = document.getElementById("item-form-quantity");
 
+const ELEMENT_VISITOR_CONFIG = document.getElementById("visitor-config");
 const ELEMENT_VISITOR_NAME = document.getElementById("visitor-form-name");
 const ELEMENT_VISITOR_TYPE = document.getElementById("visitor-form-type");
 const ELEMENT_VISITOR_SHOP_TYPE = document.getElementById("visitor-form-shop-type");
 const ELEMENT_VISITOR_GAME = document.getElementById("visitor-form-game");
+const ELEMENT_VISITOR_REGION = document.getElementById("visitor-form-region");
+const ELEMENT_VISITOR_SUBREGION = document.getElementById("visitor-form-subregion");
 const ELEMENT_VISITOR_PERSONALITY = document.getElementById("visitor-form-personality");
 const ELEMENT_VISITOR_DREAMER = document.getElementById("visitor-form-dreamer");
 
@@ -57,7 +63,8 @@ var profile = {
         if(response.dreamerInfo) {
             let dreamerInfo = response.dreamerInfo;
             ELEMENT_DREAMER_SPRITE.innerHTML = "<image src='" + response.dreamerSprite + "'/>";
-            ELEMENT_DREAMER_SPECIES.innerHTML = POKE_SPECIES_LIST[dreamerInfo.species - 1].name;
+            ELEMENT_DREAMER_SPECIES.innerHTML = SPECIES_MAP[dreamerInfo.species] ? (SPECIES_MAP[dreamerInfo.species].name) : "N/A";
+            ELEMENT_DREAMER_ABILITY.innerHTML = ABILITY_MAP[dreamerInfo.ability] ? ABILITY_MAP[dreamerInfo.ability].name : "N/A";
             ELEMENT_DREAMER_NATURE.innerHTML = stringToWord(dreamerInfo.nature);
             ELEMENT_DREAMER_NAME.innerHTML = dreamerInfo.nickname;
             ELEMENT_DREAMER_GENDER.innerHTML = stringToWord(dreamerInfo.gender);
@@ -100,38 +107,51 @@ var profile = {
         document.getElementById("main-container").style.display = "flex";
     });
     
+    // Sort data lists alphabetically
+    let sortedSpecies = [...SPECIES_LIST].sort((a, b) => a.name.localeCompare(b.name));
+    let sortedMoves = [...MOVE_LIST].sort((a, b) => a.name.localeCompare(b.name));
+    let sortedItems = [...ITEM_LIST].sort((a, b) => a.name.localeCompare(b.name));
+    
     // Add species data
-    for(let i in POKE_SPECIES_LIST) {
-        let species = POKE_SPECIES_LIST[i];
-        let formattedName = "#" + ("00" + species.id).slice(-3) + " - " + species.name;
-        ELEMENT_VISITOR_DREAMER.options[ELEMENT_VISITOR_DREAMER.options.length] = new Option(formattedName, species.id);
+    for(let i in sortedSpecies) {
+        let species = sortedSpecies[i];
+        ELEMENT_VISITOR_DREAMER.options[ELEMENT_VISITOR_DREAMER.options.length] = new Option(species.name, species.id);
         
         if(species.downloadable && (isVersion2() || species.id <= 493)) {
-            ELEMENT_ENCOUNTER_SPECIES.options[ELEMENT_ENCOUNTER_SPECIES.options.length] = new Option(formattedName, species.id);
+            ELEMENT_ENCOUNTER_SPECIES.options[ELEMENT_ENCOUNTER_SPECIES.options.length] = new Option(species.name, species.id);
         }
     }
     
     // Add move data
-    for(let i in POKE_MOVE_LIST) {
-        let move = POKE_MOVE_LIST[i];
-        let formattedName = "#" + ("00" + move.id).slice(-3) + " - " + move.name;
-        ELEMENT_ENCOUNTER_MOVE.options[ELEMENT_ENCOUNTER_MOVE.options.length] = new Option(formattedName, move.id);
+    for(let i in sortedMoves) {
+        let move = sortedMoves[i];
+        ELEMENT_ENCOUNTER_MOVE.options[ELEMENT_ENCOUNTER_MOVE.options.length] = new Option(move.name, move.id);
     }
     
     // Add item data
-    for(let i in ITEM_LIST) {
-        let item = ITEM_LIST[i];
+    for(let i in sortedItems) {
+        let item = sortedItems[i];
         
         if(isVersion2() || item.id <= 626) {
-            let formattedName = "#" + ("00" + item.id).slice(-3) + " - " + item.name;
-            ELEMENT_ITEM_ID.options[ELEMENT_ITEM_ID.options.length] = new Option(formattedName, item.id);
+            ELEMENT_ITEM_ID.options[ELEMENT_ITEM_ID.options.length] = new Option(item.name, item.id);
         }
     }
     
-    // Event listener for changing the form selector contents when species changes
+    // Add region data (already sorted alphabetically)
+    for(let i in REGION_LIST) {
+        let region = REGION_LIST[i];
+        ELEMENT_VISITOR_REGION.options[ELEMENT_VISITOR_REGION.options.length] = new Option(region.name, region.id);
+    }
+    
+    // Event listener for changing the form & gender selector contents when species changes
     ELEMENT_ENCOUNTER_SPECIES.addEventListener("change", function() {
-        updateEncounterFormOptions();
-        ELEMENT_ENCOUNTER_FORM.value = 0;
+        ELEMENT_ENCOUNTER_FORM.value = updateEncounterFormOptions();
+        ELEMENT_ENCOUNTER_GENDER.value = updateEncounterGenderOptions();
+    });
+    
+    // Same thing, but for Join Avenue visitor region & subregion
+    ELEMENT_VISITOR_REGION.addEventListener("change", function() {
+        ELEMENT_VISITOR_SUBREGION.value = updateVisitorSubregionOptions();
     });
 })();
 
@@ -141,7 +161,7 @@ var profile = {
 
 function updateEncounterFormOptions() {
     clearSelectOptions(ELEMENT_ENCOUNTER_FORM);
-    let species = POKE_SPECIES_LIST[ELEMENT_ENCOUNTER_SPECIES.value - 1];
+    let species = SPECIES_MAP[ELEMENT_ENCOUNTER_SPECIES.value];
     
     // Update special form options
     if(species.forms) {
@@ -149,19 +169,49 @@ function updateEncounterFormOptions() {
             ELEMENT_ENCOUNTER_FORM.options[ELEMENT_ENCOUNTER_FORM.options.length] = new Option(species.forms[i], i);
         }
     } else {
-        ELEMENT_ENCOUNTER_FORM.options[ELEMENT_ENCOUNTER_FORM.options.length] = new Option("Normal", 0);
+        ELEMENT_ENCOUNTER_FORM.options[ELEMENT_ENCOUNTER_FORM.options.length] = new Option("N/A", 0);
     }
+    
+    return 0;
+}
+
+function updateEncounterGenderOptions() {
+    clearSelectOptions(ELEMENT_ENCOUNTER_GENDER);
+    let species = SPECIES_MAP[ELEMENT_ENCOUNTER_SPECIES.value];
+    
+    // Update gender options
+    if(species.gender) {
+        console.log(species.gender);
+        switch(species.gender) {
+            case "male":
+                ELEMENT_ENCOUNTER_GENDER.options[0] = new Option("Male", "MALE");
+                return "MALE";
+            case "female":
+                ELEMENT_ENCOUNTER_GENDER.options[0] = new Option("Female", "FEMALE");
+                return "FEMALE";
+            case "unknown":
+                ELEMENT_ENCOUNTER_GENDER.options[0] = new Option("N/A", "GENDERLESS");
+                return "GENDERLESS";
+        }
+    }
+    
+    ELEMENT_ENCOUNTER_GENDER.options[0] = new Option("Male", "MALE");
+    ELEMENT_ENCOUNTER_GENDER.options[1] = new Option("Female", "FEMALE");
+    ELEMENT_ENCOUNTER_GENDER.options[2] = new Option("Random", "GENDERLESS");
+    return "GENDERLESS";
 }
 
 function configureEncounter(index) {
     encounterTableIndex = Math.min(10, Math.min(index, profile.encounters.length));
     let encounter = profile.encounters[encounterTableIndex];
-    ELEMENT_ENCOUNTER_SPECIES.value = encounter ? encounter.species : 1;
-    updateEncounterFormOptions();
+    ELEMENT_ENCOUNTER_SPECIES.value = encounter ? encounter.species : 493;
+    let form = updateEncounterFormOptions();
+    let gender = updateEncounterGenderOptions();
     ELEMENT_ENCOUNTER_MOVE.value = encounter ? encounter.move : 0;
-    ELEMENT_ENCOUNTER_FORM.value = encounter ? encounter.form : 0;
-    ELEMENT_ENCOUNTER_GENDER.value = encounter ? encounter.gender : "GENDERLESS";
-    ELEMENT_ENCOUNTER_ANIMATION.value = encounter ? encounter.animation : "WALK_AROUND";
+    ELEMENT_ENCOUNTER_FORM.value = encounter ? encounter.form : form;
+    ELEMENT_ENCOUNTER_GENDER.value = encounter ? encounter.gender : gender;
+    ELEMENT_ENCOUNTER_ANIMATION.value = encounter ? encounter.animation : "LOOK_AROUND";
+    ELEMENT_ENCOUNTER_CONFIG.style.display = "block";
 }
 
 function saveEncounter() {
@@ -208,13 +258,20 @@ function updateEncounterCell(index) {
     if(encounterData) {
         spriteImage = spriteBase + encounterData.species + ".png";
         
-        // Use unique form sprite if it exists
         if(encounterData.form > 0) {
+            // Use unique form sprite if it exists
             let formSpriteImage = spriteBase + encounterData.species + "-" + encounterData.form + ".png";
             
             if(checkURL(formSpriteImage)){
                 spriteImage = formSpriteImage;
             }
+        } else if(encounterData.gender == "FEMALE") {
+            // Otherwise, use female sprite if it exists
+            let femaleSpriteImage = spriteBase + "female/" + encounterData.species + ".png";
+            
+            if(checkURL(femaleSpriteImage)){
+                spriteImage = femaleSpriteImage;
+            }
         }
     }
     
@@ -223,12 +280,33 @@ function updateEncounterCell(index) {
 
 function closeEncounterForm() {
     encounterTableIndex = -1;
-    window.location.href = "#";
+    ELEMENT_ENCOUNTER_CONFIG.style.display = "none";
 }
 
 /**
  * Join Avenue visitor configuration stuff
  */
+ 
+ function updateVisitorSubregionOptions() {
+    clearSelectOptions(ELEMENT_VISITOR_SUBREGION);
+    let region = REGION_MAP[ELEMENT_VISITOR_REGION.value];
+    
+    // Update subregion options
+    if(region.subregions) {
+        let sortedSubregions = [...region.subregions].sort((a, b) => a.name.localeCompare(b.name));
+        
+        for(let i in sortedSubregions) {
+            let subregion = sortedSubregions[i];
+            ELEMENT_VISITOR_SUBREGION.options[ELEMENT_VISITOR_SUBREGION.options.length] = new Option(subregion.name, subregion.id);
+        }
+        
+        return 1;
+    } else {
+        ELEMENT_VISITOR_SUBREGION.options[ELEMENT_VISITOR_SUBREGION.options.length] = new Option("N/A", 0);
+    }
+    
+    return 0;
+}
 
 function configureVisitor(index) {
     visitorTableIndex = Math.min(12, Math.min(index, profile.visitors.length));
@@ -237,8 +315,12 @@ function configureVisitor(index) {
     ELEMENT_VISITOR_TYPE.value = visitor ? visitor.type : "ACE_TRAINER_MALE";
     ELEMENT_VISITOR_SHOP_TYPE.value = visitor ? visitor.shopType : "RAFFLE";
     ELEMENT_VISITOR_GAME.value = visitor ? visitor.gameVersion : "BLACK_ENGLISH";
+    ELEMENT_VISITOR_REGION.value = visitor ? visitor.countryCode : 1;
+    updateVisitorSubregionOptions();
+    ELEMENT_VISITOR_SUBREGION.value = visitor ? visitor.stateProvinceCode : 0;
     ELEMENT_VISITOR_PERSONALITY.value = visitor ? visitor.personality : 0;
     ELEMENT_VISITOR_DREAMER.value = visitor ? visitor.dreamerSpecies : 1;
+    ELEMENT_VISITOR_CONFIG.style.display = "block";
 }
 
 function saveVisitor() {
@@ -265,18 +347,16 @@ function saveVisitor() {
         }
     }
     
-    // I'll make country codes configurable later... probably
     profile.visitors[visitorTableIndex] = {
         name: ELEMENT_VISITOR_NAME.value,
         type: ELEMENT_VISITOR_TYPE.value,
         shopType: ELEMENT_VISITOR_SHOP_TYPE.value,
         gameVersion: ELEMENT_VISITOR_GAME.value,
-        countryCode: 220, // United States
-        stateProvinceCode: 48, // Washington, D.C.
+        countryCode: ELEMENT_VISITOR_REGION.value,
+        stateProvinceCode: ELEMENT_VISITOR_SUBREGION.value,
         personality: ELEMENT_VISITOR_PERSONALITY.value,
         dreamerSpecies: ELEMENT_VISITOR_DREAMER.value
     };
-    console.log(profile.visitors[visitorTableIndex]);
     updateVisitorCell(visitorTableIndex);
     closeVisitorForm();
 }
@@ -318,7 +398,7 @@ function updateVisitorCell(index) {
 
 function closeVisitorForm() {
     visitorTableIndex = -1;
-    window.location.href = "#";
+    ELEMENT_VISITOR_CONFIG.style.display = "none";
 }
 
 /**
@@ -330,6 +410,7 @@ function configureItem(index) {
     let item = profile.items[itemTableIndex];
     ELEMENT_ITEM_ID.value = item ? item.id : 1;
     ELEMENT_ITEM_QUANTITY.value = item ? item.quantity : 1;
+    ELEMENT_ITEM_CONFIG.style.display = "block";
 }
 
 function saveItem() {
@@ -385,7 +466,7 @@ function updateItemCell(index) {
 
 function closeItemForm() {
     itemTableIndex = -1;
-    window.location.href = "#";
+    ELEMENT_ITEM_CONFIG.style.display = "none";
 }
 
 /**

src/main/resources/dashboard/styles/profile.css

@@ -100,20 +100,13 @@ a:link, a:visited {
 }
 
 .popup {
+    display: none;
     position: fixed;
     top: 0;
     bottom: 0;
     left: 0;
     right: 0;
     background: rgba(0, 0, 0, 0.6);
-    opacity: 0;
-    transition: opacity 200ms;
-    visibility: hidden;
-}
-
-.popup:target {
-    opacity: 1;
-    visibility: visible;
 }
 
 .popup .close-button {
@@ -147,6 +140,7 @@ a:link, a:visited {
     width: 96px;
     height: 96px;
     text-align: center;
+    cursor: pointer;
 }
 
 .item-table {
@@ -163,6 +157,7 @@ a:link, a:visited {
     width: 48px;
     height: 48px;
     text-align: center;
+    cursor: pointer;
 }
 
 .item-table td a {
@@ -185,6 +180,7 @@ a:link, a:visited {
     width: 80px;
     height: 80px;
     text-align: center;
+    cursor: pointer;
 }
 
 .big-button {