more

dions scripts/generate rematch teams mapping for vseeker.ps1

@@ -449,104 +449,73 @@ $rematchesTeams = @{}
 $rematchesLocations = @{}
 
 
-foreach ($m in $matches)
-{
-    $trainers = $m.Groups[1].Value -split '\s*,\s*'
-    $map = $m.Groups[2].Value
+foreach ($m in $matches) {
+   $trainers = $m.Groups[1].Value -split '\s*,\s*'
+   $map = $m.Groups[2].Value
 
-    $result = ($trainers + $map) -join ' + '
-    $result
-
-    $rematchesTeams[$trainers[0]] = $trainers
-    $rematchesLocations[$trainers[0]] = $map
+   $rematchesTeams[$trainers[0]] = $trainers
+   $rematchesLocations[$trainers[0]] = $map
 }
 
- $root = "C:\Users\dionmoustos\Projects\pokefirered\"
+$root = "C:\Users\dionmoustos\Projects\pokefirered\"
 
 Get-ChildItem -Path $root -Recurse -File -Filter "scripts.inc" |
 ForEach-Object {
-    Write-Host "Processing: $($_.FullName)"
+   # ----------------------------
+   # Read entire file as one string
+   # ----------------------------
+   $content = Get-Content -Path $_.FullName -Raw
+   $new = $content
 
-    # ----------------------------
-    # Read entire file as one string
-    # ----------------------------
-    $content = Get-Content -Path $_.FullName -Raw
-    $new = $content
+   # ----------------------------
+   # Regex pattern (PowerShell-safe)
+   # Your pattern:
+   # [a-zA-Z_0-9]+::(\n\t[a-zA-Z_0-9 ,]+)+
+   # ----------------------------
+   $pattern = '[a-zA-Z_0-9]+::(\r?\n\t[a-zA-Z_0-9 ,]+)+'
 
-    # ----------------------------
-    # Regex pattern (PowerShell-safe)
-    # Your pattern:
-    # [a-zA-Z_0-9]+::(\n\t[a-zA-Z_0-9 ,]+)+
-    # ----------------------------
-    $pattern = '[a-zA-Z_0-9]+::(\r?\n\t[a-zA-Z_0-9 ,]+)+'
+   # ----------------------------
+   # Extract matches as array of multiline strings
+   # ----------------------------
+   $matches = [regex]::Matches($content, $pattern)
 
-    # ----------------------------
-    # Extract matches as array of multiline strings
-    # ----------------------------
-    $matches = [regex]::Matches($content, $pattern)
+   $array = @()
+   foreach ($m in $matches) {
+      $array += $m.Value.Trim()
+   }
 
-    $array = @()
-    foreach ($m in $matches) {
-        $array += $m.Value
-    }
+   # ----------------------------
+   # Do replacements on original string
+   # (example transformation per item)
+   # ----------------------------
+   $trainers = @()
+   foreach ($item in $array) {
+      if ($item -match '^\s*([A-Za-z0-9_]+)::\s*\r?\n\s*trainerbattle_single\s+([A-Za-z0-9_]+),\s*([A-Za-z0-9_]+)*,\s*([A-Za-z0-9_]+)') {
+         $trainers += $matches[2]           
+      }
+      elseif ($item -match '^\s*([A-Za-z0-9_]+)::\s*\r?\n\s*trainerbattle_double\s+([A-Za-z0-9_]+),\s*([A-Za-z0-9_]+)*,\s*([A-Za-z0-9_]+)') {
+         $trainers += $matches[2]
+      }
+   }
 
-    # ----------------------------
-    # Do replacements on original string
-    # (example transformation per item)
-    # ----------------------------
-    foreach ($item in $array) {
-        if ($item -match '^\s*([A-Za-z0-9_]+)::\s*\r?\n\s*trainerbattle_single\s+([A-Za-z0-9_]+),\s*([A-Za-z0-9_]+),\s*([A-Za-z0-9_]+)\r?\n\s*msgbox\s+([A-Za-z0-9_]+),\s*([A-Za-z0-9_]+)\r?\n\s*end') {
-            $eventScript = $matches[1]
-            $trainer = $matches[2]
-            $introText = $matches[3]
-            $defeatText = $matches[4]
-            $postbattle = $matches[5]
-            $messagebox = $matches[6]
+   if ($trainers.Count -gt 0) {
+      $location = Split-Path (Split-Path $_.PSPath -Parent) -Leaf
 
-            $replacement = "$eventScript::
-    trainerbattle_single $trainer, $introText, $defeatText
-    specialvar VAR_RESULT, ShouldTryRematchBattle
-    goto_if_eq VAR_RESULT, TRUE, $eventScript`Rematch
-    msgbox $postbattle, $messagebox
-    end
-
-$($eventScript)Rematch::
-    trainerbattle_rematch $trainer, $introText, $defeatText
-    msgbox $postbattle, $messagebox
-    end"
-
-            $content = $content -replace [regex]::Escape($item), $replacement
-        } elseif ($item -match '^\s*([A-Za-z0-9_]+)::\s*\r?\n\s*trainerbattle_double\s+([A-Za-z0-9_]+),\s*([A-Za-z0-9_]+),\s*([A-Za-z0-9_]+),\s*([A-Za-z0-9_]+)\r?\n\s*msgbox\s+([A-Za-z0-9_]+),\s*([A-Za-z0-9_]+)\r?\n\s*end') {
-            $eventScript = $matches[1]
-            $trainer = $matches[2]
-            $introText = $matches[3]
-            $defeatText = $matches[4]
-            $notenoughmons = $matches[5]
-            $postbattle = $matches[6]
-            $messagebox = $matches[7]
-
-            $replacement = "$eventScript::
-    trainerbattle_double $trainer, $introText, $defeatText, $notenoughmons
-    specialvar VAR_RESULT, ShouldTryRematchBattle
-    goto_if_eq VAR_RESULT, TRUE, $eventScript`Rematch
-    msgbox $postbattle, $messagebox
-    end
-
-$($eventScript)Rematch::
-    trainerbattle_rematch_double $trainer, $introText, $defeatText, $notenoughmons
-    msgbox $postbattle, $messagebox
-    end"
-            
-            $content = $content -replace [regex]::Escape($item), $replacement
-        }
-
-    }
-
-    # ----------------------------
-    # Write back to file
-    # ----------------------------
-    if($new -ne $content) {
-        Set-Content -Path $_.FullName -Value $content
-        Write-Host "Updated: $($_.FullName)"
-    }
+      $matches = [regex]::Matches($location, '([a-z])([A-Z])')
+      foreach ($match in $matches) {
+         $location = $location -replace $match.Value, "$($match.Groups[1].Value)_$($match.Groups[2].Value)"
+      }
+      $location = $location.ToUpper()
+      foreach ($trainer in $trainers) {
+         $rematchesTeams[$trainer] = @($trainer, $trainer)
+         $rematchesLocations[$trainer] = "MAP_$location"
+      }
+   }
 }
+
+foreach ($trainer in $rematchesTeams.Keys) {
+   $team = $rematchesTeams[$trainer]
+   $location = $rematchesLocations[$trainer]
+   Write-Output "   { {$($team -join ", ")},"
+   Write-Output "      MAP(${location}) },"
+}

src/vs_seeker.c

@@ -120,446 +120,500 @@ static bool8 ObjectEventIdIsSane(u8 objectEventId);
 static u8 GetRandomFaceDirectionMovementType();
 
 static const struct RematchData sRematches[] = {
-   { {TRAINER_YOUNGSTER_BEN, TRAINER_YOUNGSTER_BEN_2, SKIP, TRAINER_YOUNGSTER_BEN_3, TRAINER_YOUNGSTER_BEN_4}, MAP(MAP_ROUTE3) },
-   { {TRAINER_YOUNGSTER_CALVIN, TRAINER_YOUNGSTER_CALVIN}, MAP(MAP_ROUTE3) },
-   { {TRAINER_BUG_CATCHER_COLTON, TRAINER_BUG_CATCHER_COLTON_2, SKIP, TRAINER_BUG_CATCHER_COLTON_3, SKIP, TRAINER_BUG_CATCHER_COLTON_4},
-      MAP(MAP_ROUTE3) },
-   { {TRAINER_BUG_CATCHER_GREG, TRAINER_BUG_CATCHER_GREG},
-      MAP(MAP_ROUTE3) },
-   { {TRAINER_BUG_CATCHER_JAMES, TRAINER_BUG_CATCHER_JAMES},
-      MAP(MAP_ROUTE3) },
-   { {TRAINER_LASS_JANICE, TRAINER_LASS_JANICE_2, SKIP, TRAINER_LASS_JANICE_3},
-      MAP(MAP_ROUTE3) },
-   { {TRAINER_LASS_SALLY, TRAINER_LASS_SALLY},
-      MAP(MAP_ROUTE3) },
-   { {TRAINER_LASS_ROBIN, TRAINER_LASS_ROBIN},
-      MAP(MAP_ROUTE3) },
-   { {TRAINER_LASS_CRISSY, TRAINER_LASS_CRISSY},
-      MAP(MAP_ROUTE4) },
-   { {TRAINER_YOUNGSTER_TIMMY, TRAINER_YOUNGSTER_TIMMY_2, SKIP, TRAINER_YOUNGSTER_TIMMY_3, SKIP, TRAINER_YOUNGSTER_TIMMY_4},
-      MAP(MAP_ROUTE24) },
-   { {TRAINER_BUG_CATCHER_CALE, TRAINER_BUG_CATCHER_CALE},
-      MAP(MAP_ROUTE24) },
-   { {TRAINER_LASS_RELI, TRAINER_LASS_RELI_2, SKIP, TRAINER_LASS_RELI_3},
-      MAP(MAP_ROUTE24) },
-   { {TRAINER_LASS_ALI, TRAINER_LASS_ALI},
-      MAP(MAP_ROUTE24) },
-   { {TRAINER_CAMPER_SHANE, TRAINER_CAMPER_SHANE},
-      MAP(MAP_ROUTE24) },
-   { {TRAINER_CAMPER_ETHAN, TRAINER_CAMPER_ETHAN},
-      MAP(MAP_ROUTE24) },
-   { {TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY},
-      MAP(MAP_ROUTE25) },
-   { {TRAINER_YOUNGSTER_DAN, TRAINER_YOUNGSTER_DAN},
-      MAP(MAP_ROUTE25) },
-   { {TRAINER_YOUNGSTER_CHAD, TRAINER_YOUNGSTER_CHAD_2, SKIP, TRAINER_YOUNGSTER_CHAD_3, TRAINER_YOUNGSTER_CHAD_4},
-      MAP(MAP_ROUTE25) },
-   { {TRAINER_PICNICKER_KELSEY, TRAINER_PICNICKER_KELSEY_2, SKIP, TRAINER_PICNICKER_KELSEY_3, TRAINER_PICNICKER_KELSEY_4},
-      MAP(MAP_ROUTE25) },
-   { {TRAINER_LASS_HALEY, TRAINER_LASS_HALEY},
-      MAP(MAP_ROUTE25) },
-   { {TRAINER_HIKER_FRANKLIN, SKIP, TRAINER_HIKER_FRANKLIN_2},
-      MAP(MAP_ROUTE25) },
-   { {TRAINER_HIKER_NOB, TRAINER_HIKER_NOB},
-      MAP(MAP_ROUTE25) },
-   { {TRAINER_HIKER_WAYNE, TRAINER_HIKER_WAYNE},
-      MAP(MAP_ROUTE25) },
-   { {TRAINER_CAMPER_FLINT, TRAINER_CAMPER_FLINT},
-      MAP(MAP_ROUTE25) },
-   { {TRAINER_BUG_CATCHER_KEIGO, TRAINER_BUG_CATCHER_KEIGO},
-      MAP(MAP_ROUTE6) },
-   { {TRAINER_BUG_CATCHER_ELIJAH, TRAINER_BUG_CATCHER_ELIJAH},
-      MAP(MAP_ROUTE6) },
-   { {TRAINER_CAMPER_RICKY, TRAINER_CAMPER_RICKY_2, SKIP, TRAINER_CAMPER_RICKY_3, SKIP, TRAINER_CAMPER_RICKY_4},
-      MAP(MAP_ROUTE6) },
-   { {TRAINER_CAMPER_JEFF, TRAINER_CAMPER_JEFF_2, SKIP, TRAINER_CAMPER_JEFF_3, SKIP, TRAINER_CAMPER_JEFF_4},
-      MAP(MAP_ROUTE6) },
-   { {TRAINER_PICNICKER_NANCY, TRAINER_PICNICKER_NANCY},
-      MAP(MAP_ROUTE6) },
-   { {TRAINER_PICNICKER_ISABELLE, TRAINER_PICNICKER_ISABELLE_2, SKIP, TRAINER_PICNICKER_ISABELLE_3, TRAINER_PICNICKER_ISABELLE_4},
-      MAP(MAP_ROUTE6) },
-   { {TRAINER_YOUNGSTER_EDDIE, TRAINER_YOUNGSTER_EDDIE},
-      MAP(MAP_ROUTE11) },
-   { {TRAINER_YOUNGSTER_DILLON, TRAINER_YOUNGSTER_DILLON},
-      MAP(MAP_ROUTE11) },
-   { {TRAINER_YOUNGSTER_YASU, SKIP, TRAINER_YOUNGSTER_YASU_2, SKIP, TRAINER_YOUNGSTER_YASU_3},
-      MAP(MAP_ROUTE11) },
-   { {TRAINER_YOUNGSTER_DAVE, TRAINER_YOUNGSTER_DAVE},
-      MAP(MAP_ROUTE11) },
-   { {TRAINER_ENGINEER_BRAXTON, TRAINER_ENGINEER_BRAXTON},
-      MAP(MAP_ROUTE11) },
-   { {TRAINER_ENGINEER_BERNIE, SKIP, SKIP, TRAINER_ENGINEER_BERNIE_2},
-      MAP(MAP_ROUTE11) },
-   { {TRAINER_GAMER_HUGO, TRAINER_GAMER_HUGO},
-      MAP(MAP_ROUTE11) },
-   { {TRAINER_GAMER_JASPER, TRAINER_GAMER_JASPER},
-      MAP(MAP_ROUTE11) },
-   { {TRAINER_GAMER_DIRK, TRAINER_GAMER_DIRK},
-      MAP(MAP_ROUTE11) },
-   { {TRAINER_GAMER_DARIAN, SKIP, SKIP, TRAINER_GAMER_DARIAN_2},
-      MAP(MAP_ROUTE11) },
-   { {TRAINER_BUG_CATCHER_BRENT, TRAINER_BUG_CATCHER_BRENT},
-      MAP(MAP_ROUTE9) },
-   { {TRAINER_BUG_CATCHER_CONNER, TRAINER_BUG_CATCHER_CONNER},
-      MAP(MAP_ROUTE9) },
-   { {TRAINER_CAMPER_CHRIS, SKIP, TRAINER_CAMPER_CHRIS_2, TRAINER_CAMPER_CHRIS_3, SKIP, TRAINER_CAMPER_CHRIS_4},
-      MAP(MAP_ROUTE9) },
-   { {TRAINER_CAMPER_DREW, TRAINER_CAMPER_DREW},
-      MAP(MAP_ROUTE9) },
-   { {TRAINER_PICNICKER_ALICIA, SKIP, TRAINER_PICNICKER_ALICIA_2, TRAINER_PICNICKER_ALICIA_3, SKIP, TRAINER_PICNICKER_ALICIA_4},
-      MAP(MAP_ROUTE9) },
-   { {TRAINER_PICNICKER_CAITLIN, TRAINER_PICNICKER_CAITLIN},
-      MAP(MAP_ROUTE9) },
-   { {TRAINER_HIKER_ALAN, TRAINER_HIKER_ALAN},
-      MAP(MAP_ROUTE9) },
-   { {TRAINER_HIKER_BRICE, TRAINER_HIKER_BRICE},
-      MAP(MAP_ROUTE9) },
-   { {TRAINER_HIKER_JEREMY, SKIP, SKIP, TRAINER_HIKER_JEREMY_2},
-      MAP(MAP_ROUTE9) },
-   { {TRAINER_PICNICKER_HEIDI, TRAINER_PICNICKER_HEIDI},
-      MAP(MAP_ROUTE10) },
-   { {TRAINER_PICNICKER_CAROL, TRAINER_PICNICKER_CAROL},
-      MAP(MAP_ROUTE10) },
-   { {TRAINER_POKEMANIAC_MARK, SKIP, SKIP, TRAINER_POKEMANIAC_MARK_2, SKIP, TRAINER_POKEMANIAC_MARK_3},
-      MAP(MAP_ROUTE10) },
-   { {TRAINER_POKEMANIAC_HERMAN, SKIP, SKIP, TRAINER_POKEMANIAC_HERMAN_2, SKIP, TRAINER_POKEMANIAC_HERMAN_3},
-      MAP(MAP_ROUTE10) },
-   { {TRAINER_HIKER_CLARK, TRAINER_HIKER_CLARK},
-      MAP(MAP_ROUTE10) },
-   { {TRAINER_HIKER_TRENT, SKIP, SKIP, TRAINER_HIKER_TRENT_2},
-      MAP(MAP_ROUTE10) },
+   { {TRAINER_BIRD_KEEPER_HAROLD, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_HAROLD_2},
+      MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) },
+   { {TRAINER_SWIMMER_FEMALE_ABIGAIL, TRAINER_SWIMMER_FEMALE_ABIGAIL},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_BIRD_KEEPER_SEBASTIAN, TRAINER_BIRD_KEEPER_SEBASTIAN},  
+      MAP(MAP_ROUTE13) },
+   { {TRAINER_BURGLAR_QUINN, TRAINER_BURGLAR_QUINN},
+      MAP(MAP_CINNABAR_ISLAND_GYM) },
    { {TRAINER_LASS_PAIGE, TRAINER_LASS_PAIGE},
       MAP(MAP_ROUTE8) },
-   { {TRAINER_LASS_ANDREA, TRAINER_LASS_ANDREA},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_LASS_MEGAN, SKIP, TRAINER_LASS_MEGAN_2, SKIP, TRAINER_LASS_MEGAN_3},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_LASS_JULIA, TRAINER_LASS_JULIA},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_SUPER_NERD_AIDAN, TRAINER_SUPER_NERD_AIDAN},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_SUPER_NERD_GLENN, SKIP, SKIP, TRAINER_SUPER_NERD_GLENN_2},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_SUPER_NERD_LESLIE, TRAINER_SUPER_NERD_LESLIE},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_GAMER_STAN, TRAINER_GAMER_STAN},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_GAMER_RICH, SKIP, SKIP, TRAINER_GAMER_RICH_2},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_TWINS_ELI_ANNE, SKIP, SKIP, TRAINER_TWINS_ELI_ANNE_2},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_BIKER_RICARDO, TRAINER_BIKER_RICARDO},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_BIKER_JAREN, SKIP, SKIP, TRAINER_BIKER_JAREN_2},
-      MAP(MAP_ROUTE8) },
-   { {TRAINER_FISHERMAN_NED, TRAINER_FISHERMAN_NED},
-      MAP(MAP_ROUTE12) },
-   { {TRAINER_FISHERMAN_CHIP, TRAINER_FISHERMAN_CHIP},
-      MAP(MAP_ROUTE12) },
-   { {TRAINER_FISHERMAN_HANK, TRAINER_FISHERMAN_HANK},
-      MAP(MAP_ROUTE12) },
-   { {TRAINER_FISHERMAN_ELLIOT, SKIP, SKIP, TRAINER_FISHERMAN_ELLIOT_2},
-      MAP(MAP_ROUTE12) },
-   { {TRAINER_FISHERMAN_ANDREW, TRAINER_FISHERMAN_ANDREW},
-      MAP(MAP_ROUTE12) },
-   { {TRAINER_ROCKER_LUCA, SKIP, SKIP, TRAINER_ROCKER_LUCA_2},
-      MAP(MAP_ROUTE12) },
-   { {TRAINER_CAMPER_JUSTIN, TRAINER_CAMPER_JUSTIN},
-      MAP(MAP_ROUTE12) },
-   { {TRAINER_YOUNG_COUPLE_GIA_JES, SKIP, SKIP, TRAINER_YOUNG_COUPLE_GIA_JES_2, SKIP, TRAINER_YOUNG_COUPLE_GIA_JES_3},
-      MAP(MAP_ROUTE12) },
-   { {TRAINER_BIKER_JARED, TRAINER_BIKER_JARED},
-      MAP(MAP_ROUTE13) },
-   { {TRAINER_BEAUTY_LOLA, TRAINER_BEAUTY_LOLA},
-      MAP(MAP_ROUTE13) },
-   { {TRAINER_BEAUTY_SHEILA, SKIP, SKIP, SKIP, TRAINER_BEAUTY_SHEILA_2},
-      MAP(MAP_ROUTE13) },
-   { {TRAINER_BIRD_KEEPER_SEBASTIAN, TRAINER_BIRD_KEEPER_SEBASTIAN},
-      MAP(MAP_ROUTE13) },
-   { {TRAINER_BIRD_KEEPER_PERRY, TRAINER_BIRD_KEEPER_PERRY},
-      MAP(MAP_ROUTE13) },
-   { {TRAINER_BIRD_KEEPER_ROBERT, SKIP, SKIP, TRAINER_BIRD_KEEPER_ROBERT_2, TRAINER_BIRD_KEEPER_ROBERT_3},
-      MAP(MAP_ROUTE13) },
-   { {TRAINER_PICNICKER_ALMA, TRAINER_PICNICKER_ALMA},
-      MAP(MAP_ROUTE13) },
-   { {TRAINER_PICNICKER_SUSIE, SKIP, SKIP, TRAINER_PICNICKER_SUSIE_2, TRAINER_PICNICKER_SUSIE_3, TRAINER_PICNICKER_SUSIE_4},
-      MAP(MAP_ROUTE13) },
-   { {TRAINER_PICNICKER_VALERIE, TRAINER_PICNICKER_VALERIE},
-      MAP(MAP_ROUTE13) },
-   { {TRAINER_PICNICKER_GWEN, TRAINER_PICNICKER_GWEN},
-      MAP(MAP_ROUTE13) },
-   { {TRAINER_BIKER_MALIK, TRAINER_BIKER_MALIK},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_BIKER_LUKAS, SKIP, SKIP, SKIP, TRAINER_BIKER_LUKAS_2},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_BIKER_ISAAC, TRAINER_BIKER_ISAAC},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_BIKER_GERALD, TRAINER_BIKER_GERALD},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_BIRD_KEEPER_DONALD, TRAINER_BIRD_KEEPER_DONALD},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_BIRD_KEEPER_BENNY, SKIP, SKIP, TRAINER_BIRD_KEEPER_BENNY_2, TRAINER_BIRD_KEEPER_BENNY_3},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_BIRD_KEEPER_CARTER, TRAINER_BIRD_KEEPER_CARTER},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_BIRD_KEEPER_MITCH, TRAINER_BIRD_KEEPER_MITCH},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_BIRD_KEEPER_BECK, TRAINER_BIRD_KEEPER_BECK},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_BIRD_KEEPER_MARLON, SKIP, SKIP, TRAINER_BIRD_KEEPER_MARLON_2, TRAINER_BIRD_KEEPER_MARLON_3},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_TWINS_KIRI_JAN, TRAINER_TWINS_KIRI_JAN},
-      MAP(MAP_ROUTE14) },
-   { {TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST},
-      MAP(MAP_ROUTE15) },
-   { {TRAINER_BIKER_ALEX, TRAINER_BIKER_ALEX},
-      MAP(MAP_ROUTE15) },
+   { {TRAINER_TEAM_ROCKET_GRUNT_20, TRAINER_TEAM_ROCKET_GRUNT_20},
+      MAP(MAP_POKEMON_TOWER_7F) },
    { {TRAINER_BEAUTY_GRACE, SKIP, SKIP, SKIP, TRAINER_BEAUTY_GRACE_2},
       MAP(MAP_ROUTE15) },
-   { {TRAINER_BEAUTY_OLIVIA, TRAINER_BEAUTY_OLIVIA},
-      MAP(MAP_ROUTE15) },
-   { {TRAINER_BIRD_KEEPER_EDWIN, TRAINER_BIRD_KEEPER_EDWIN},
-      MAP(MAP_ROUTE15) },
-   { {TRAINER_BIRD_KEEPER_CHESTER, SKIP, SKIP, TRAINER_BIRD_KEEPER_CHESTER_2, TRAINER_BIRD_KEEPER_CHESTER_3},
-      MAP(MAP_ROUTE15) },
-   { {TRAINER_PICNICKER_YAZMIN, TRAINER_PICNICKER_YAZMIN},
-      MAP(MAP_ROUTE15) },
-   { {TRAINER_PICNICKER_KINDRA, TRAINER_PICNICKER_KINDRA},
-      MAP(MAP_ROUTE15) },
-   { {TRAINER_PICNICKER_BECKY, SKIP, SKIP, TRAINER_PICNICKER_BECKY_2, TRAINER_PICNICKER_BECKY_3, TRAINER_PICNICKER_BECKY_4},
-      MAP(MAP_ROUTE15) },
-   { {TRAINER_PICNICKER_CELIA, TRAINER_PICNICKER_CELIA},
-      MAP(MAP_ROUTE15) },
-   { {TRAINER_CRUSH_KIN_RON_MYA, SKIP, SKIP, TRAINER_CRUSH_KIN_RON_MYA_2, TRAINER_CRUSH_KIN_RON_MYA_3, TRAINER_CRUSH_KIN_RON_MYA_4},
-      MAP(MAP_ROUTE15) },
-   { {TRAINER_BIKER_LAO, TRAINER_BIKER_LAO},
-      MAP(MAP_ROUTE16) },
-   { {TRAINER_BIKER_HIDEO, TRAINER_BIKER_HIDEO},
-      MAP(MAP_ROUTE16) },
-   { {TRAINER_BIKER_RUBEN, SKIP, SKIP, SKIP, TRAINER_BIKER_RUBEN_2},
-      MAP(MAP_ROUTE16) },
-   { {TRAINER_CUE_BALL_KOJI, TRAINER_CUE_BALL_KOJI},
-      MAP(MAP_ROUTE16) },
-   { {TRAINER_CUE_BALL_LUKE, TRAINER_CUE_BALL_LUKE},
-      MAP(MAP_ROUTE16) },
-   { {TRAINER_CUE_BALL_CAMRON, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_CAMRON_2},
-      MAP(MAP_ROUTE16) },
-   { {TRAINER_YOUNG_COUPLE_LEA_JED, TRAINER_YOUNG_COUPLE_LEA_JED},
-      MAP(MAP_ROUTE16) },
-   { {TRAINER_BIKER_BILLY, TRAINER_BIKER_BILLY},
-      MAP(MAP_ROUTE17) },
-   { {TRAINER_BIKER_NIKOLAS, TRAINER_BIKER_NIKOLAS},
-      MAP(MAP_ROUTE17) },
-   { {TRAINER_BIKER_JAXON, SKIP, SKIP, SKIP, TRAINER_BIKER_JAXON_2},
-      MAP(MAP_ROUTE17) },
-   { {TRAINER_BIKER_WILLIAM, TRAINER_BIKER_WILLIAM},
-      MAP(MAP_ROUTE17) },
-   { {TRAINER_CUE_BALL_RAUL, TRAINER_CUE_BALL_RAUL},
-      MAP(MAP_ROUTE17) },
-   { {TRAINER_CUE_BALL_ISAIAH, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_ISAIAH_2},
-      MAP(MAP_ROUTE17) },
-   { {TRAINER_CUE_BALL_ZEEK, TRAINER_CUE_BALL_ZEEK},
-      MAP(MAP_ROUTE17) },
-   { {TRAINER_CUE_BALL_JAMAL, TRAINER_CUE_BALL_JAMAL},
-      MAP(MAP_ROUTE17) },
-   { {TRAINER_CUE_BALL_COREY, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_COREY_2},
-      MAP(MAP_ROUTE17) },
+   { {TRAINER_BIRD_KEEPER_CARTER, TRAINER_BIRD_KEEPER_CARTER},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_SUPER_NERD_AVERY, TRAINER_SUPER_NERD_AVERY},
+      MAP(MAP_CINNABAR_ISLAND_GYM) },
    { {TRAINER_BIKER_VIRGIL, TRAINER_BIKER_VIRGIL},
       MAP(MAP_ROUTE17) },
-   { {TRAINER_BIRD_KEEPER_WILTON, TRAINER_BIRD_KEEPER_WILTON},
-      MAP(MAP_ROUTE18) },
-   { {TRAINER_BIRD_KEEPER_RAMIRO, TRAINER_BIRD_KEEPER_RAMIRO},
-      MAP(MAP_ROUTE18) },
-   { {TRAINER_BIRD_KEEPER_JACOB, SKIP, SKIP, TRAINER_BIRD_KEEPER_JACOB_2, TRAINER_BIRD_KEEPER_JACOB_3},
-      MAP(MAP_ROUTE18) },
-   { {TRAINER_SWIMMER_MALE_RICHARD, TRAINER_SWIMMER_MALE_RICHARD},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SWIMMER_MALE_REECE, TRAINER_SWIMMER_MALE_REECE},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SWIMMER_MALE_MATTHEW, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_MATTHEW_2},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SWIMMER_MALE_DOUGLAS, TRAINER_SWIMMER_MALE_DOUGLAS},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SWIMMER_MALE_DAVID, TRAINER_SWIMMER_MALE_DAVID},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SWIMMER_MALE_TONY, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_TONY_2},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SWIMMER_MALE_AXLE, TRAINER_SWIMMER_MALE_AXLE},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SWIMMER_FEMALE_ANYA, TRAINER_SWIMMER_FEMALE_ANYA},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SWIMMER_FEMALE_ALICE, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_ALICE_2},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SWIMMER_FEMALE_CONNIE, TRAINER_SWIMMER_FEMALE_CONNIE},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SIS_AND_BRO_LIA_LUC, TRAINER_SIS_AND_BRO_LIA_LUC},
-      MAP(MAP_ROUTE19) },
-   { {TRAINER_SWIMMER_MALE_BARRY, TRAINER_SWIMMER_MALE_BARRY},
-      MAP(MAP_ROUTE20) },
-   { {TRAINER_SWIMMER_MALE_DEAN, TRAINER_SWIMMER_MALE_DEAN},
-      MAP(MAP_ROUTE20) },
-   { {TRAINER_SWIMMER_MALE_DARRIN, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_DARRIN_2},
-      MAP(MAP_ROUTE20) },
-   { {TRAINER_SWIMMER_FEMALE_TIFFANY, TRAINER_SWIMMER_FEMALE_TIFFANY},
-      MAP(MAP_ROUTE20) },
-   { {TRAINER_SWIMMER_FEMALE_NORA, TRAINER_SWIMMER_FEMALE_NORA},
-      MAP(MAP_ROUTE20) },
-   { {TRAINER_SWIMMER_FEMALE_MELISSA, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_MELISSA_2},
-      MAP(MAP_ROUTE20) },
-   { {TRAINER_SWIMMER_FEMALE_SHIRLEY, TRAINER_SWIMMER_FEMALE_SHIRLEY},
-      MAP(MAP_ROUTE20) },
-   { {TRAINER_BIRD_KEEPER_ROGER, TRAINER_BIRD_KEEPER_ROGER},
-      MAP(MAP_ROUTE20) },
-   { {TRAINER_PICNICKER_MISSY, SKIP, SKIP, SKIP, TRAINER_PICNICKER_MISSY_2, TRAINER_PICNICKER_MISSY_3},
-      MAP(MAP_ROUTE20) },
-   { {TRAINER_PICNICKER_IRENE, TRAINER_PICNICKER_IRENE},
-      MAP(MAP_ROUTE20) },
-   { {TRAINER_FISHERMAN_RONALD, TRAINER_FISHERMAN_RONALD},
-      MAP(MAP_ROUTE21_NORTH) },
-   { {TRAINER_FISHERMAN_CLAUDE, TRAINER_FISHERMAN_CLAUDE},
-      MAP(MAP_ROUTE21_NORTH) },
+   { {TRAINER_PAINTER_DAISY, TRAINER_PAINTER_DAISY},
+      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
+   { {TRAINER_SWIMMER_FEMALE_AMARA, TRAINER_SWIMMER_FEMALE_AMARA},
+      MAP(MAP_ONE_ISLAND_TREASURE_BEACH) },
    { {TRAINER_FISHERMAN_WADE, SKIP, SKIP, SKIP, TRAINER_FISHERMAN_WADE_2},
       MAP(MAP_ROUTE21_NORTH) },
-   { {TRAINER_FISHERMAN_NOLAN, TRAINER_FISHERMAN_NOLAN},
-      MAP(MAP_ROUTE21_NORTH) },
-   { {TRAINER_SWIMMER_MALE_SPENCER, TRAINER_SWIMMER_MALE_SPENCER},
-      MAP(MAP_ROUTE21_NORTH) },
-   { {TRAINER_SWIMMER_MALE_JACK, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_JACK_2},
-      MAP(MAP_ROUTE21_NORTH) },
-   { {TRAINER_SWIMMER_MALE_JEROME, TRAINER_SWIMMER_MALE_JEROME},
-      MAP(MAP_ROUTE21_NORTH) },
-   { {TRAINER_SWIMMER_MALE_ROLAND, TRAINER_SWIMMER_MALE_ROLAND},
-      MAP(MAP_ROUTE21_NORTH) },
-   { {TRAINER_SIS_AND_BRO_LIL_IAN, SKIP, SKIP, SKIP, TRAINER_SIS_AND_BRO_LIL_IAN_2, TRAINER_SIS_AND_BRO_LIL_IAN_3},
-      MAP(MAP_ROUTE21_NORTH) },
    { {TRAINER_SWIMMER_FEMALE_MARIA, TRAINER_SWIMMER_FEMALE_MARIA},
       MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_SWIMMER_FEMALE_ABIGAIL, TRAINER_SWIMMER_FEMALE_ABIGAIL},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_SWIMMER_MALE_FINN, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_FINN_2},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_SWIMMER_MALE_GARRETT, TRAINER_SWIMMER_MALE_GARRETT},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_FISHERMAN_TOMMY, TRAINER_FISHERMAN_TOMMY},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_CRUSH_GIRL_SHARON, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_SHARON_2, TRAINER_CRUSH_GIRL_SHARON_3},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_CRUSH_GIRL_TANYA, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_TANYA_2, TRAINER_CRUSH_GIRL_TANYA_3},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_BLACK_BELT_SHEA, SKIP, SKIP, SKIP, TRAINER_BLACK_BELT_SHEA_2, TRAINER_BLACK_BELT_SHEA_3},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_BLACK_BELT_HUGH, SKIP, SKIP, SKIP, TRAINER_BLACK_BELT_HUGH_2, TRAINER_BLACK_BELT_HUGH_3},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_CAMPER_BRYCE, TRAINER_CAMPER_BRYCE},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_PICNICKER_CLAIRE, TRAINER_PICNICKER_CLAIRE},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_CRUSH_KIN_MIK_KIA, SKIP, SKIP, SKIP, TRAINER_CRUSH_KIN_MIK_KIA_2, TRAINER_CRUSH_KIN_MIK_KIA_3},
-      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
-   { {TRAINER_SWIMMER_FEMALE_AMARA, TRAINER_SWIMMER_FEMALE_AMARA},
-      MAP(MAP_ONE_ISLAND_TREASURE_BEACH) },
-   { {TRAINER_AROMA_LADY_NIKKI, TRAINER_AROMA_LADY_NIKKI},
-      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
-   { {TRAINER_AROMA_LADY_VIOLET, TRAINER_AROMA_LADY_VIOLET},
-      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
-   { {TRAINER_TUBER_AMIRA, SKIP, SKIP, SKIP, TRAINER_TUBER_AMIRA_2},
-      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
-   { {TRAINER_TUBER_ALEXIS, TRAINER_TUBER_ALEXIS},
-      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
-   { {TRAINER_SWIMMER_FEMALE_TISHA, TRAINER_SWIMMER_FEMALE_TISHA},
-      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
-   { {TRAINER_TWINS_JOY_MEG, SKIP, SKIP, SKIP, TRAINER_TWINS_JOY_MEG_2},
-      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
-   { {TRAINER_PAINTER_DAISY, TRAINER_PAINTER_DAISY},
-      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
-   { {TRAINER_PAINTER_CELINA, TRAINER_PAINTER_CELINA},
-      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
-   { {TRAINER_PAINTER_RAYNA, SKIP, SKIP, SKIP, SKIP, TRAINER_PAINTER_RAYNA_2},
-      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
-   { {TRAINER_LADY_JACKI, TRAINER_LADY_JACKI},
-      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
-   { {TRAINER_LADY_GILLIAN, TRAINER_LADY_GILLIAN},
-      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
-   { {TRAINER_YOUNGSTER_DESTIN, SKIP, SKIP, SKIP, SKIP, TRAINER_YOUNGSTER_DESTIN_2},
-      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
-   { {TRAINER_SWIMMER_MALE_TOBY, TRAINER_SWIMMER_MALE_TOBY},
-      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
-   { {TRAINER_PKMN_BREEDER_ALIZE, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_BREEDER_ALIZE_2},
-      MAP(MAP_FIVE_ISLAND_WATER_LABYRINTH) },
-   { {TRAINER_BIRD_KEEPER_MILO, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_MILO_2},
-      MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) },
-   { {TRAINER_BIRD_KEEPER_CHAZ, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_CHAZ_2},
-      MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) },
-   { {TRAINER_BIRD_KEEPER_HAROLD, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_HAROLD_2},
-      MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) },
-   { {TRAINER_FISHERMAN_TYLOR, TRAINER_FISHERMAN_TYLOR},
-      MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
-   { {TRAINER_SWIMMER_MALE_MYMO, TRAINER_SWIMMER_MALE_MYMO},
-      MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
-   { {TRAINER_SWIMMER_FEMALE_NICOLE, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_NICOLE_2},
-      MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
-   { {TRAINER_SIS_AND_BRO_AVA_GEB, TRAINER_SIS_AND_BRO_AVA_GEB},
-      MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
-   { {TRAINER_PSYCHIC_JACLYN, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_JACLYN_2},
-      MAP(MAP_SIX_ISLAND_GREEN_PATH) },
-   { {TRAINER_AROMA_LADY_ROSE, TRAINER_AROMA_LADY_ROSE},
-      MAP(MAP_SIX_ISLAND_WATER_PATH) },
-   { {TRAINER_JUGGLER_EDWARD, TRAINER_JUGGLER_EDWARD},
-      MAP(MAP_SIX_ISLAND_WATER_PATH) },
-   { {TRAINER_SWIMMER_MALE_SAMIR, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_SAMIR_2},
-      MAP(MAP_SIX_ISLAND_WATER_PATH) },
-   { {TRAINER_SWIMMER_FEMALE_DENISE, TRAINER_SWIMMER_FEMALE_DENISE},
-      MAP(MAP_SIX_ISLAND_WATER_PATH) },
-   { {TRAINER_TWINS_MIU_MIA, TRAINER_TWINS_MIU_MIA},
-      MAP(MAP_SIX_ISLAND_WATER_PATH) },
-   { {TRAINER_HIKER_EARL, SKIP, SKIP, SKIP, SKIP, TRAINER_HIKER_EARL_2},
-      MAP(MAP_SIX_ISLAND_WATER_PATH) },
-   { {TRAINER_RUIN_MANIAC_STANLY, TRAINER_RUIN_MANIAC_STANLY},
-      MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
-   { {TRAINER_RUIN_MANIAC_FOSTER, TRAINER_RUIN_MANIAC_FOSTER},
-      MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
-   { {TRAINER_RUIN_MANIAC_LARRY, SKIP, SKIP, SKIP, SKIP, TRAINER_RUIN_MANIAC_LARRY_2},
-      MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
-   { {TRAINER_HIKER_DARYL, TRAINER_HIKER_DARYL},
-      MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
-   { {TRAINER_POKEMANIAC_HECTOR, SKIP, SKIP, SKIP, SKIP, TRAINER_POKEMANIAC_HECTOR_2},
-      MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
-   { {TRAINER_PSYCHIC_DARIO, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_DARIO_2},
-      MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER) },
-   { {TRAINER_PSYCHIC_RODETTE, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_RODETTE_2},
-      MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER) },
-   { {TRAINER_AROMA_LADY_MIAH, TRAINER_AROMA_LADY_MIAH},
-      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
-   { {TRAINER_YOUNG_COUPLE_EVE_JON, TRAINER_YOUNG_COUPLE_EVE_JON},
-      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
+   { {TRAINER_HIKER_WAYNE, TRAINER_HIKER_WAYNE},
+      MAP(MAP_ROUTE25) },
+   { {TRAINER_SIS_AND_BRO_LIA_LUC, TRAINER_SIS_AND_BRO_LIA_LUC},
+      MAP(MAP_ROUTE19) },
    { {TRAINER_JUGGLER_MASON, SKIP, SKIP, SKIP, SKIP, TRAINER_JUGGLER_MASON_2},
       MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
-   { {TRAINER_PKMN_RANGER_NICOLAS, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_NICOLAS_2},
+   { {TRAINER_PICNICKER_ALMA, TRAINER_PICNICKER_ALMA},
+      MAP(MAP_ROUTE13) },
+   { {TRAINER_YOUNGSTER_DESTIN, SKIP, SKIP, SKIP, SKIP, TRAINER_YOUNGSTER_DESTIN_2},
+      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
+   { {TRAINER_PICNICKER_IRENE, TRAINER_PICNICKER_IRENE},
+      MAP(MAP_ROUTE20) },
+   { {TRAINER_SWIMMER_MALE_SAMIR, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_SAMIR_2},
+      MAP(MAP_SIX_ISLAND_WATER_PATH) },
+   { {TRAINER_FISHERMAN_RONALD, TRAINER_FISHERMAN_RONALD},
+      MAP(MAP_ROUTE21_NORTH) },
+   { {TRAINER_TUBER_AMIRA, SKIP, SKIP, SKIP, TRAINER_TUBER_AMIRA_2},
+      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
+   { {TRAINER_FISHERMAN_NOLAN, TRAINER_FISHERMAN_NOLAN},
+      MAP(MAP_ROUTE21_NORTH) },
+   { {TRAINER_SUPER_NERD_AIDAN, TRAINER_SUPER_NERD_AIDAN},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_PICNICKER_ISABELLE, TRAINER_PICNICKER_ISABELLE_2, SKIP, TRAINER_PICNICKER_ISABELLE_3, TRAINER_PICNICKER_ISABELLE_4},
+      MAP(MAP_ROUTE6) },
+   { {TRAINER_BUG_CATCHER_KEIGO, TRAINER_BUG_CATCHER_KEIGO},
+      MAP(MAP_ROUTE6) },
+   { {TRAINER_BUG_CATCHER_CALE, TRAINER_BUG_CATCHER_CALE},
+      MAP(MAP_ROUTE24) },
+   { {TRAINER_CUE_BALL_CAMRON, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_CAMRON_2},
+      MAP(MAP_ROUTE16) },
+   { {TRAINER_FISHERMAN_ANDREW, TRAINER_FISHERMAN_ANDREW},
+      MAP(MAP_ROUTE12) },
+   { {TRAINER_BEAUTY_TAMIA, TRAINER_BEAUTY_TAMIA},
+      MAP(MAP_CELADON_CITY_GYM) },
+   { {TRAINER_AROMA_LADY_MIAH, TRAINER_AROMA_LADY_MIAH},
       MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
-   { {TRAINER_PKMN_RANGER_MADELINE, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_MADELINE_2},
-      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
-   { {TRAINER_CRUSH_GIRL_CYNDY, SKIP, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_CYNDY_2},
-      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
-   { {TRAINER_TAMER_EVAN, SKIP, SKIP, SKIP, SKIP, TRAINER_TAMER_EVAN_2},
-      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
-   { {TRAINER_PKMN_RANGER_JACKSON, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_JACKSON_2},
-      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
-   { {TRAINER_PKMN_RANGER_KATELYN, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_KATELYN_2},
-      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
-   { {TRAINER_COOLTRAINER_LEROY, SKIP, SKIP, SKIP, SKIP, TRAINER_COOLTRAINER_LEROY_2},
-      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
+   { {TRAINER_HIKER_TRENT, SKIP, SKIP, TRAINER_HIKER_TRENT_2},
+      MAP(MAP_ROUTE10) },
    { {TRAINER_COOLTRAINER_MICHELLE, SKIP, SKIP, SKIP, SKIP, TRAINER_COOLTRAINER_MICHELLE_2},
       MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
-   { {TRAINER_COOL_COUPLE_LEX_NYA, SKIP, SKIP, SKIP, SKIP, TRAINER_COOL_COUPLE_LEX_NYA_2},
+   { {TRAINER_BIRD_KEEPER_CHAZ, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_CHAZ_2},
+      MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) },
+   { {TRAINER_TEAM_ROCKET_GRUNT_18, TRAINER_TEAM_ROCKET_GRUNT_18},
+      MAP(MAP_ROCKET_HIDEOUT_B4F) },
+   { {TRAINER_SWIMMER_MALE_REECE, TRAINER_SWIMMER_MALE_REECE},
+      MAP(MAP_ROUTE19) },
+   { {TRAINER_LASS_LISA, TRAINER_LASS_LISA},
+      MAP(MAP_CELADON_CITY_GYM) },
+   { {TRAINER_BEAUTY_OLIVIA, TRAINER_BEAUTY_OLIVIA},
+      MAP(MAP_ROUTE15) },
+   { {TRAINER_HIKER_NOB, TRAINER_HIKER_NOB},
+      MAP(MAP_ROUTE25) },
+   { {TRAINER_HIKER_BRICE, TRAINER_HIKER_BRICE},
+      MAP(MAP_ROUTE9) },
+   { {TRAINER_TAMER_EVAN, SKIP, SKIP, SKIP, SKIP, TRAINER_TAMER_EVAN_2},
       MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
+   { {TRAINER_SWIMMER_MALE_LUIS, TRAINER_SWIMMER_MALE_LUIS},
+      MAP(MAP_CERULEAN_CITY_GYM) },
+   { {TRAINER_BLACK_BELT_HUGH, SKIP, SKIP, SKIP, TRAINER_BLACK_BELT_HUGH_2, TRAINER_BLACK_BELT_HUGH_3},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_CAMPER_CHRIS, SKIP, TRAINER_CAMPER_CHRIS_2, TRAINER_CAMPER_CHRIS_3, SKIP, TRAINER_CAMPER_CHRIS_4},
+      MAP(MAP_ROUTE9) },
+   { {TRAINER_PICNICKER_CLAIRE, TRAINER_PICNICKER_CLAIRE},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_BIKER_NIKOLAS, TRAINER_BIKER_NIKOLAS},
+      MAP(MAP_ROUTE17) },
+   { {TRAINER_CUE_BALL_COREY, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_COREY_2},
+      MAP(MAP_ROUTE17) },
+   { {TRAINER_YOUNG_COUPLE_EVE_JON, TRAINER_YOUNG_COUPLE_EVE_JON},
+      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
+   { {TRAINER_HIKER_EARL, SKIP, SKIP, SKIP, SKIP, TRAINER_HIKER_EARL_2},
+      MAP(MAP_SIX_ISLAND_WATER_PATH) },
+   { {TRAINER_CAMPER_JUSTIN, TRAINER_CAMPER_JUSTIN},
+      MAP(MAP_ROUTE12) },
+   { {TRAINER_TWINS_JOY_MEG, SKIP, SKIP, SKIP, TRAINER_TWINS_JOY_MEG_2},
+      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
+   { {TRAINER_BIKER_WILLIAM, TRAINER_BIKER_WILLIAM},
+      MAP(MAP_ROUTE17) },
+   { {TRAINER_BIKER_GERALD, TRAINER_BIKER_GERALD},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_PICNICKER_HEIDI, TRAINER_PICNICKER_HEIDI},
+      MAP(MAP_ROUTE10) },
+   { {TRAINER_SWIMMER_MALE_MYMO, TRAINER_SWIMMER_MALE_MYMO},
+      MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
+   { {TRAINER_SUPER_NERD_ZAC, TRAINER_SUPER_NERD_ZAC},
+      MAP(MAP_CINNABAR_ISLAND_GYM) },
    { {TRAINER_RUIN_MANIAC_BRANDON, TRAINER_RUIN_MANIAC_BRANDON},
       MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) },
+   { {TRAINER_SWIMMER_FEMALE_CONNIE, TRAINER_SWIMMER_FEMALE_CONNIE},
+      MAP(MAP_ROUTE19) },
+   { {TRAINER_SWIMMER_MALE_TONY, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_TONY_2},
+      MAP(MAP_ROUTE19) },
+   { {TRAINER_PICNICKER_CAROL, TRAINER_PICNICKER_CAROL},
+      MAP(MAP_ROUTE10) },
+   { {TRAINER_PICNICKER_SUSIE, SKIP, SKIP, TRAINER_PICNICKER_SUSIE_2, TRAINER_PICNICKER_SUSIE_3, TRAINER_PICNICKER_SUSIE_4},
+      MAP(MAP_ROUTE13) },
+   { {TRAINER_BIKER_MALIK, TRAINER_BIKER_MALIK},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_CAMPER_DREW, TRAINER_CAMPER_DREW},
+      MAP(MAP_ROUTE9) },
+   { {TRAINER_HIKER_JEREMY, SKIP, SKIP, TRAINER_HIKER_JEREMY_2},
+      MAP(MAP_ROUTE9) },
+   { {TRAINER_TEAM_ROCKET_ADMIN_2, TRAINER_TEAM_ROCKET_ADMIN_2},
+      MAP(MAP_FIVE_ISLAND_ROCKET_WAREHOUSE) },
+   { {TRAINER_CRUSH_GIRL_CYNDY, SKIP, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_CYNDY_2},
+      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
+   { {TRAINER_PICNICKER_KELSEY, TRAINER_PICNICKER_KELSEY_2, SKIP, TRAINER_PICNICKER_KELSEY_3, TRAINER_PICNICKER_KELSEY_4},
+      MAP(MAP_ROUTE25) },
+   { {TRAINER_LASS_JULIA, TRAINER_LASS_JULIA},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_SAILOR_DWAYNE, TRAINER_SAILOR_DWAYNE},
+      MAP(MAP_VERMILION_CITY_GYM) },
+   { {TRAINER_GAMER_STAN, TRAINER_GAMER_STAN},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_SWIMMER_MALE_GARRETT, TRAINER_SWIMMER_MALE_GARRETT},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_SWIMMER_FEMALE_NICOLE, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_NICOLE_2},
+      MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
+   { {TRAINER_TEAM_ROCKET_GRUNT_7, TRAINER_TEAM_ROCKET_GRUNT_7},
+      MAP(MAP_CELADON_CITY_GAME_CORNER) },
+   { {TRAINER_TEAM_ROCKET_ADMIN, TRAINER_TEAM_ROCKET_ADMIN},
+      MAP(MAP_FIVE_ISLAND_ROCKET_WAREHOUSE) },
+   { {TRAINER_SWIMMER_MALE_RICHARD, TRAINER_SWIMMER_MALE_RICHARD},
+      MAP(MAP_ROUTE19) },
+   { {TRAINER_PICNICKER_CELIA, TRAINER_PICNICKER_CELIA},
+      MAP(MAP_ROUTE15) },
+   { {TRAINER_TEAM_ROCKET_GRUNT_17, TRAINER_TEAM_ROCKET_GRUNT_17},
+      MAP(MAP_ROCKET_HIDEOUT_B4F) },
+   { {TRAINER_RUIN_MANIAC_FOSTER, TRAINER_RUIN_MANIAC_FOSTER},
+      MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
+   { {TRAINER_BIKER_LUKAS, SKIP, SKIP, SKIP, TRAINER_BIKER_LUKAS_2},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_GAMER_DARIAN, SKIP, SKIP, TRAINER_GAMER_DARIAN_2},
+      MAP(MAP_ROUTE11) },
+   { {TRAINER_PICNICKER_NANCY, TRAINER_PICNICKER_NANCY},
+      MAP(MAP_ROUTE6) },
+   { {TRAINER_BUG_CATCHER_BRENT, TRAINER_BUG_CATCHER_BRENT},
+      MAP(MAP_ROUTE9) },
+   { {TRAINER_BIRD_KEEPER_ROGER, TRAINER_BIRD_KEEPER_ROGER},
+      MAP(MAP_ROUTE20) },
+   { {TRAINER_BIRD_KEEPER_MARLON, SKIP, SKIP, TRAINER_BIRD_KEEPER_MARLON_2, TRAINER_BIRD_KEEPER_MARLON_3},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_YOUNGSTER_DAVE, TRAINER_YOUNGSTER_DAVE},
+      MAP(MAP_ROUTE11) },
+   { {TRAINER_BEAUTY_SHEILA, SKIP, SKIP, SKIP, TRAINER_BEAUTY_SHEILA_2},
+      MAP(MAP_ROUTE13) },
+   { {TRAINER_SWIMMER_MALE_JEROME, TRAINER_SWIMMER_MALE_JEROME},
+      MAP(MAP_ROUTE21_NORTH) },
+   { {TRAINER_SWIMMER_FEMALE_TIFFANY, TRAINER_SWIMMER_FEMALE_TIFFANY},
+      MAP(MAP_ROUTE20) },
+   { {TRAINER_BIKER_HIDEO, TRAINER_BIKER_HIDEO},
+      MAP(MAP_ROUTE16) },
+   { {TRAINER_PAINTER_CELINA, TRAINER_PAINTER_CELINA},
+      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
+   { {TRAINER_CAMPER_RICKY, TRAINER_CAMPER_RICKY_2, SKIP, TRAINER_CAMPER_RICKY_3, SKIP, TRAINER_CAMPER_RICKY_4},
+      MAP(MAP_ROUTE6) },
+   { {TRAINER_GAMER_JASPER, TRAINER_GAMER_JASPER},
+      MAP(MAP_ROUTE11) },
+   { {TRAINER_SWIMMER_FEMALE_MELISSA, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_MELISSA_2},
+      MAP(MAP_ROUTE20) },
+   { {TRAINER_BIKER_ALEX, TRAINER_BIKER_ALEX},
+      MAP(MAP_ROUTE15) },
+   { {TRAINER_SWIMMER_MALE_FINN, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_FINN_2},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_BIRD_KEEPER_MITCH, TRAINER_BIRD_KEEPER_MITCH},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_SWIMMER_MALE_AXLE, TRAINER_SWIMMER_MALE_AXLE},
+      MAP(MAP_ROUTE19) },
+   { {TRAINER_BIRD_KEEPER_BECK, TRAINER_BIRD_KEEPER_BECK},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_CUE_BALL_ZEEK, TRAINER_CUE_BALL_ZEEK},
+      MAP(MAP_ROUTE17) },
+   { {TRAINER_BIRD_KEEPER_JACOB, SKIP, SKIP, TRAINER_BIRD_KEEPER_JACOB_2, TRAINER_BIRD_KEEPER_JACOB_3},
+      MAP(MAP_ROUTE18) },
+   { {TRAINER_PICNICKER_KINDRA, TRAINER_PICNICKER_KINDRA},
+      MAP(MAP_ROUTE15) },
+   { {TRAINER_GAMER_DIRK, TRAINER_GAMER_DIRK},
+      MAP(MAP_ROUTE11) },
+   { {TRAINER_SUPER_NERD_LESLIE, TRAINER_SUPER_NERD_LESLIE},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_SWIMMER_MALE_BARRY, TRAINER_SWIMMER_MALE_BARRY},
+      MAP(MAP_ROUTE20) },
+   { {TRAINER_CAMPER_BRYCE, TRAINER_CAMPER_BRYCE},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_LASS_HALEY, TRAINER_LASS_HALEY},
+      MAP(MAP_ROUTE25) },
+   { {TRAINER_PICNICKER_ALICIA, SKIP, TRAINER_PICNICKER_ALICIA_2, TRAINER_PICNICKER_ALICIA_3, SKIP, TRAINER_PICNICKER_ALICIA_4},
+      MAP(MAP_ROUTE9) },
+   { {TRAINER_LASS_JANICE, TRAINER_LASS_JANICE_2, SKIP, TRAINER_LASS_JANICE_3},
+      MAP(MAP_ROUTE3) },
+   { {TRAINER_CAMPER_ETHAN, TRAINER_CAMPER_ETHAN},
+      MAP(MAP_ROUTE24) },
+   { {TRAINER_ENGINEER_BERNIE, SKIP, SKIP, TRAINER_ENGINEER_BERNIE_2},
+      MAP(MAP_ROUTE11) },
+   { {TRAINER_CAMPER_SHANE, TRAINER_CAMPER_SHANE},
+      MAP(MAP_ROUTE24) },
    { {TRAINER_RUIN_MANIAC_BENJAMIN, TRAINER_RUIN_MANIAC_BENJAMIN},
       MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) },
-   { {TRAINER_PAINTER_EDNA, TRAINER_PAINTER_EDNA},
-      MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) },
+   { {TRAINER_TWINS_ELI_ANNE, SKIP, SKIP, TRAINER_TWINS_ELI_ANNE_2},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_TEAM_ROCKET_GRUNT_21, TRAINER_TEAM_ROCKET_GRUNT_21},
+      MAP(MAP_POKEMON_TOWER_7F) },
+   { {TRAINER_SCIENTIST_GIDEON, TRAINER_SCIENTIST_GIDEON},
+      MAP(MAP_FIVE_ISLAND_ROCKET_WAREHOUSE) },
+   { {TRAINER_BIKER_LAO, TRAINER_BIKER_LAO},
+      MAP(MAP_ROUTE16) },
+   { {TRAINER_YOUNGSTER_CALVIN, TRAINER_YOUNGSTER_CALVIN},
+      MAP(MAP_ROUTE3) },
+   { {TRAINER_BIKER_BILLY, TRAINER_BIKER_BILLY},
+      MAP(MAP_ROUTE17) },
+   { {TRAINER_POKEMANIAC_HERMAN, SKIP, SKIP, TRAINER_POKEMANIAC_HERMAN_2, SKIP, TRAINER_POKEMANIAC_HERMAN_3},
+      MAP(MAP_ROUTE10) },
+   { {TRAINER_FISHERMAN_TYLOR, TRAINER_FISHERMAN_TYLOR},
+      MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
+   { {TRAINER_AROMA_LADY_NIKKI, TRAINER_AROMA_LADY_NIKKI},
+      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
+   { {TRAINER_PSYCHIC_TYRON, TRAINER_PSYCHIC_TYRON},
+      MAP(MAP_SAFFRON_CITY_GYM) },
+   { {TRAINER_PICNICKER_VALERIE, TRAINER_PICNICKER_VALERIE},
+      MAP(MAP_ROUTE13) },
+   { {TRAINER_HIKER_FRANKLIN, SKIP, TRAINER_HIKER_FRANKLIN_2},
+      MAP(MAP_ROUTE25) },
+   { {TRAINER_TEAM_ROCKET_GRUNT_16, TRAINER_TEAM_ROCKET_GRUNT_16},
+      MAP(MAP_ROCKET_HIDEOUT_B4F) },
+   { {TRAINER_BUG_CATCHER_JAMES, TRAINER_BUG_CATCHER_JAMES},
+      MAP(MAP_ROUTE3) },
+   { {TRAINER_TWINS_MIU_MIA, TRAINER_TWINS_MIU_MIA},
+      MAP(MAP_SIX_ISLAND_WATER_PATH) },
+   { {TRAINER_BIRD_KEEPER_RAMIRO, TRAINER_BIRD_KEEPER_RAMIRO},
+      MAP(MAP_ROUTE18) },
+   { {TRAINER_HIKER_CLARK, TRAINER_HIKER_CLARK},
+      MAP(MAP_ROUTE10) },
+   { {TRAINER_CUE_BALL_LUKE, TRAINER_CUE_BALL_LUKE},
+      MAP(MAP_ROUTE16) },
+   { {TRAINER_BURGLAR_DUSTY, TRAINER_BURGLAR_DUSTY},
+      MAP(MAP_CINNABAR_ISLAND_GYM) },
+   { {TRAINER_SWIMMER_MALE_DOUGLAS, TRAINER_SWIMMER_MALE_DOUGLAS},
+      MAP(MAP_ROUTE19) },
+   { {TRAINER_YOUNGSTER_EDDIE, TRAINER_YOUNGSTER_EDDIE},
+      MAP(MAP_ROUTE11) },
+   { {TRAINER_CUE_BALL_RAUL, TRAINER_CUE_BALL_RAUL},
+      MAP(MAP_ROUTE17) },
+   { { TRAINER_YOUNGSTER_BEN, TRAINER_YOUNGSTER_BEN_2, SKIP, TRAINER_YOUNGSTER_BEN_3, TRAINER_YOUNGSTER_BEN_4},
+      MAP(MAP_ROUTE3) },
+   { {TRAINER_SWIMMER_MALE_DARRIN, SKIP, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_DARRIN_2},
+      MAP(MAP_ROUTE20) },
+   { {TRAINER_BLACK_BELT_KOICHI, TRAINER_BLACK_BELT_KOICHI},
+      MAP(MAP_SAFFRON_CITY_DOJO) },
+   { {TRAINER_BIRD_KEEPER_BENNY, SKIP, SKIP, TRAINER_BIRD_KEEPER_BENNY_2, TRAINER_BIRD_KEEPER_BENNY_3},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_BIRD_KEEPER_ROBERT, SKIP, SKIP, TRAINER_BIRD_KEEPER_ROBERT_2, TRAINER_BIRD_KEEPER_ROBERT_3},
+      MAP(MAP_ROUTE13) },
+   { {TRAINER_ROCKER_LUCA, SKIP, SKIP, TRAINER_ROCKER_LUCA_2},
+      MAP(MAP_ROUTE12) },
+   { {TRAINER_SWIMMER_FEMALE_ALICE, SKIP, SKIP, SKIP, TRAINER_SWIMMER_FEMALE_ALICE_2},
+      MAP(MAP_ROUTE19) },
+   { {TRAINER_BIRD_KEEPER_WILTON, TRAINER_BIRD_KEEPER_WILTON},
+      MAP(MAP_ROUTE18) },
+   { {TRAINER_POKEMANIAC_HECTOR, SKIP, SKIP, SKIP, SKIP, TRAINER_POKEMANIAC_HECTOR_2},
+      MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
+   { {TRAINER_JUGGLER_EDWARD, TRAINER_JUGGLER_EDWARD},
+      MAP(MAP_SIX_ISLAND_WATER_PATH) },
+   { {TRAINER_BUG_CATCHER_ELIJAH, TRAINER_BUG_CATCHER_ELIJAH},
+      MAP(MAP_ROUTE6) },
+   { {TRAINER_PICNICKER_YAZMIN, TRAINER_PICNICKER_YAZMIN},
+      MAP(MAP_ROUTE15) },
+   { {TRAINER_CRUSH_GIRL_TANYA, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_TANYA_2, TRAINER_CRUSH_GIRL_TANYA_3},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_GAMER_RICH, SKIP, SKIP, TRAINER_GAMER_RICH_2},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_CUE_BALL_JAMAL, TRAINER_CUE_BALL_JAMAL},
+      MAP(MAP_ROUTE17) },
+   { {TRAINER_PKMN_BREEDER_ALIZE, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_BREEDER_ALIZE_2},
+      MAP(MAP_FIVE_ISLAND_WATER_LABYRINTH) },
+   { {TRAINER_YOUNG_COUPLE_GIA_JES, SKIP, SKIP, TRAINER_YOUNG_COUPLE_GIA_JES_2, SKIP, TRAINER_YOUNG_COUPLE_GIA_JES_3},
+      MAP(MAP_ROUTE12) },
+   { {TRAINER_PICNICKER_CAITLIN, TRAINER_PICNICKER_CAITLIN},
+      MAP(MAP_ROUTE9) },
+   { {TRAINER_YOUNGSTER_YASU, SKIP, TRAINER_YOUNGSTER_YASU_2, SKIP, TRAINER_YOUNGSTER_YASU_3},
+      MAP(MAP_ROUTE11) },
+   { {TRAINER_JUGGLER_KIRK, TRAINER_JUGGLER_KIRK},
+      MAP(MAP_FUCHSIA_CITY_GYM) },
    { {TRAINER_GENTLEMAN_CLIFFORD, TRAINER_GENTLEMAN_CLIFFORD},
       MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) },
+   { {TRAINER_TWINS_KIRI_JAN, TRAINER_TWINS_KIRI_JAN},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_LASS_CRISSY, TRAINER_LASS_CRISSY},
+      MAP(MAP_ROUTE4) },
+   { {TRAINER_LASS_RELI, TRAINER_LASS_RELI_2, SKIP, TRAINER_LASS_RELI_3},
+      MAP(MAP_ROUTE24) },
+   { {TRAINER_FISHERMAN_NED, TRAINER_FISHERMAN_NED},
+      MAP(MAP_ROUTE12) },
+   { {TRAINER_GENTLEMAN_TUCKER, TRAINER_GENTLEMAN_TUCKER},
+      MAP(MAP_VERMILION_CITY_GYM) },
+   { {TRAINER_BIKER_ERNEST, TRAINER_BIKER_ERNEST},
+      MAP(MAP_ROUTE15) },
+   { {TRAINER_SWIMMER_MALE_ROLAND, TRAINER_SWIMMER_MALE_ROLAND},
+      MAP(MAP_ROUTE21_NORTH) },
+   { {TRAINER_BEAUTY_LOLA, TRAINER_BEAUTY_LOLA},
+      MAP(MAP_ROUTE13) },
+   { {TRAINER_YOUNGSTER_DAN, TRAINER_YOUNGSTER_DAN},
+      MAP(MAP_ROUTE25) },
+   { {TRAINER_SWIMMER_FEMALE_SHIRLEY, TRAINER_SWIMMER_FEMALE_SHIRLEY},
+      MAP(MAP_ROUTE20) },
+   { {TRAINER_LASS_MEGAN, SKIP, TRAINER_LASS_MEGAN_2, SKIP, TRAINER_LASS_MEGAN_3},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_TEAM_ROCKET_GRUNT_12, TRAINER_TEAM_ROCKET_GRUNT_12},
+      MAP(MAP_ROCKET_HIDEOUT_B1F) },
+   { {TRAINER_SWIMMER_MALE_DEAN, TRAINER_SWIMMER_MALE_DEAN},
+      MAP(MAP_ROUTE20) },
+   { {TRAINER_FISHERMAN_CLAUDE, TRAINER_FISHERMAN_CLAUDE},
+      MAP(MAP_ROUTE21_NORTH) },
+   { {TRAINER_AROMA_LADY_VIOLET, TRAINER_AROMA_LADY_VIOLET},
+      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
+   { {TRAINER_COOL_COUPLE_RAY_TYRA, TRAINER_COOL_COUPLE_RAY_TYRA},
+      MAP(MAP_VICTORY_ROAD_3F) },
+   { {TRAINER_BIRD_KEEPER_MILO, SKIP, SKIP, SKIP, SKIP, TRAINER_BIRD_KEEPER_MILO_2},
+      MAP(MAP_FIVE_ISLAND_MEMORIAL_PILLAR) },
+   { {TRAINER_SUPER_NERD_DEREK, TRAINER_SUPER_NERD_DEREK},
+      MAP(MAP_CINNABAR_ISLAND_GYM) },
+   { {TRAINER_LASS_ROBIN, TRAINER_LASS_ROBIN},
+      MAP(MAP_ROUTE3) },
+   { {TRAINER_COOLTRAINER_LEROY, SKIP, SKIP, SKIP, SKIP, TRAINER_COOLTRAINER_LEROY_2},
+      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
+   { {TRAINER_BURGLAR_RAMON, TRAINER_BURGLAR_RAMON},
+      MAP(MAP_CINNABAR_ISLAND_GYM) },
+   { {TRAINER_CUE_BALL_KOJI, TRAINER_CUE_BALL_KOJI},
+      MAP(MAP_ROUTE16) },
+   { {TRAINER_CUE_BALL_ISAIAH, SKIP, SKIP, SKIP, TRAINER_CUE_BALL_ISAIAH_2},
+      MAP(MAP_ROUTE17) },
+   { {TRAINER_YOUNGSTER_JOEY, TRAINER_YOUNGSTER_JOEY},
+      MAP(MAP_ROUTE25) },
+   { {TRAINER_SIS_AND_BRO_LIL_IAN, SKIP, SKIP, SKIP, TRAINER_SIS_AND_BRO_LIL_IAN_2, TRAINER_SIS_AND_BRO_LIL_IAN_3},
+      MAP(MAP_ROUTE21_NORTH) },
+   { {TRAINER_PICNICKER_GWEN, TRAINER_PICNICKER_GWEN},
+      MAP(MAP_ROUTE13) },
+   { {TRAINER_BUG_CATCHER_CONNER, TRAINER_BUG_CATCHER_CONNER},
+      MAP(MAP_ROUTE9) },
+   { {TRAINER_FISHERMAN_TOMMY, TRAINER_FISHERMAN_TOMMY},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_BIRD_KEEPER_PERRY, TRAINER_BIRD_KEEPER_PERRY},
+      MAP(MAP_ROUTE13) },
+   { {TRAINER_HIKER_ALAN, TRAINER_HIKER_ALAN},
+      MAP(MAP_ROUTE9) },
+   { {TRAINER_BIKER_JAREN, SKIP, SKIP, TRAINER_BIKER_JAREN_2},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_CAMPER_JEFF, TRAINER_CAMPER_JEFF_2, SKIP, TRAINER_CAMPER_JEFF_3, SKIP, TRAINER_CAMPER_JEFF_4},
+      MAP(MAP_ROUTE6) },
+   { {TRAINER_PICNICKER_BECKY, SKIP, SKIP, TRAINER_PICNICKER_BECKY_2, TRAINER_PICNICKER_BECKY_3, TRAINER_PICNICKER_BECKY_4},
+      MAP(MAP_ROUTE15) },
+   { {TRAINER_PAINTER_RAYNA, SKIP, SKIP, SKIP, SKIP, TRAINER_PAINTER_RAYNA_2},
+      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
+   { {TRAINER_SUPER_NERD_GLENN, SKIP, SKIP, TRAINER_SUPER_NERD_GLENN_2},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_SWIMMER_FEMALE_DENISE, TRAINER_SWIMMER_FEMALE_DENISE},
+      MAP(MAP_SIX_ISLAND_WATER_PATH) },
+   { {TRAINER_LASS_ANDREA, TRAINER_LASS_ANDREA},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_LASS_ALI, TRAINER_LASS_ALI},
+      MAP(MAP_ROUTE24) },
+   { {TRAINER_PAINTER_EDNA, TRAINER_PAINTER_EDNA},
+      MAP(MAP_SEVEN_ISLAND_TANOBY_RUINS) },
+   { {TRAINER_CRUSH_KIN_MIK_KIA, SKIP, SKIP, SKIP, TRAINER_CRUSH_KIN_MIK_KIA_2, TRAINER_CRUSH_KIN_MIK_KIA_3},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_CAMPER_FLINT, TRAINER_CAMPER_FLINT},
+      MAP(MAP_ROUTE25) },
+   { {TRAINER_RUIN_MANIAC_LARRY, SKIP, SKIP, SKIP, SKIP, TRAINER_RUIN_MANIAC_LARRY_2},
+      MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
+   { {TRAINER_PSYCHIC_RODETTE, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_RODETTE_2},
+      MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER) },
+   { {TRAINER_AROMA_LADY_ROSE, TRAINER_AROMA_LADY_ROSE},
+      MAP(MAP_SIX_ISLAND_WATER_PATH) },
+   { {TRAINER_POKEMANIAC_MARK, SKIP, SKIP, TRAINER_POKEMANIAC_MARK_2, SKIP, TRAINER_POKEMANIAC_MARK_3},
+      MAP(MAP_ROUTE10) },
+   { {TRAINER_YOUNG_COUPLE_LEA_JED, TRAINER_YOUNG_COUPLE_LEA_JED},
+      MAP(MAP_ROUTE16) },
+   { {TRAINER_FISHERMAN_CHIP, TRAINER_FISHERMAN_CHIP},
+      MAP(MAP_ROUTE12) },
+   { {TRAINER_SWIMMER_FEMALE_ANYA, TRAINER_SWIMMER_FEMALE_ANYA},
+      MAP(MAP_ROUTE19) },
+   { {TRAINER_SWIMMER_FEMALE_TISHA, TRAINER_SWIMMER_FEMALE_TISHA},
+      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
+   { {TRAINER_LADY_GILLIAN, TRAINER_LADY_GILLIAN},
+      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
+   { {TRAINER_YOUNGSTER_CHAD, TRAINER_YOUNGSTER_CHAD_2, SKIP, TRAINER_YOUNGSTER_CHAD_3, TRAINER_YOUNGSTER_CHAD_4},
+      MAP(MAP_ROUTE25) },
+   { {TRAINER_BIKER_RICARDO, TRAINER_BIKER_RICARDO},
+      MAP(MAP_ROUTE8) },
+   { {TRAINER_YOUNGSTER_DILLON, TRAINER_YOUNGSTER_DILLON},
+      MAP(MAP_ROUTE11) },
+   { {TRAINER_TUBER_ALEXIS, TRAINER_TUBER_ALEXIS},
+      MAP(MAP_THREE_ISLAND_BOND_BRIDGE) },
+   { {TRAINER_SIS_AND_BRO_AVA_GEB, TRAINER_SIS_AND_BRO_AVA_GEB},
+      MAP(MAP_SIX_ISLAND_OUTCAST_ISLAND) },
+   { {TRAINER_HIKER_DARYL, TRAINER_HIKER_DARYL},
+      MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
+   { {TRAINER_BIKER_JAXON, SKIP, SKIP, SKIP, TRAINER_BIKER_JAXON_2},
+      MAP(MAP_ROUTE17) },
+   { {TRAINER_RUIN_MANIAC_STANLY, TRAINER_RUIN_MANIAC_STANLY},
+      MAP(MAP_SIX_ISLAND_RUIN_VALLEY) },
+   { {TRAINER_BIKER_JARED, TRAINER_BIKER_JARED},
+      MAP(MAP_ROUTE13) },
+   { {TRAINER_SWIMMER_FEMALE_NORA, TRAINER_SWIMMER_FEMALE_NORA},
+      MAP(MAP_ROUTE20) },
+   { {TRAINER_PICNICKER_MISSY, SKIP, SKIP, SKIP, TRAINER_PICNICKER_MISSY_2, TRAINER_PICNICKER_MISSY_3},
+      MAP(MAP_ROUTE20) },
+   { {TRAINER_BUG_CATCHER_COLTON, TRAINER_BUG_CATCHER_COLTON_2, SKIP, TRAINER_BUG_CATCHER_COLTON_3, SKIP, TRAINER_BUG_CATCHER_COLTON_4},
+      MAP(MAP_ROUTE3) },
+   { {TRAINER_SWIMMER_MALE_DAVID, TRAINER_SWIMMER_MALE_DAVID},
+      MAP(MAP_ROUTE19) },
+   { {TRAINER_BLACK_BELT_SHEA, SKIP, SKIP, SKIP, TRAINER_BLACK_BELT_SHEA_2, TRAINER_BLACK_BELT_SHEA_3},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_SWIMMER_MALE_TOBY, TRAINER_SWIMMER_MALE_TOBY},
+      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
+   { {TRAINER_CRUSH_KIN_RON_MYA, SKIP, SKIP, TRAINER_CRUSH_KIN_RON_MYA_2, TRAINER_CRUSH_KIN_RON_MYA_3, TRAINER_CRUSH_KIN_RON_MYA_4},
+      MAP(MAP_ROUTE15) },
+   { {TRAINER_PKMN_RANGER_JACKSON, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_JACKSON_2},
+      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
+   { {TRAINER_BIRD_KEEPER_CHESTER, SKIP, SKIP, TRAINER_BIRD_KEEPER_CHESTER_2, TRAINER_BIRD_KEEPER_CHESTER_3},
+      MAP(MAP_ROUTE15) },
+   { {TRAINER_SWIMMER_MALE_MATTHEW, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_MATTHEW_2},
+      MAP(MAP_ROUTE19) },
+   { {TRAINER_BUG_CATCHER_GREG, TRAINER_BUG_CATCHER_GREG},
+      MAP(MAP_ROUTE3) },
+   { {TRAINER_SWIMMER_MALE_JACK, SKIP, SKIP, SKIP, TRAINER_SWIMMER_MALE_JACK_2},
+      MAP(MAP_ROUTE21_NORTH) },
+   { {TRAINER_FISHERMAN_ELLIOT, SKIP, SKIP, TRAINER_FISHERMAN_ELLIOT_2},
+      MAP(MAP_ROUTE12) },
+   { {TRAINER_SWIMMER_MALE_SPENCER, TRAINER_SWIMMER_MALE_SPENCER},
+      MAP(MAP_ROUTE21_NORTH) },
+   { {TRAINER_ENGINEER_BRAXTON, TRAINER_ENGINEER_BRAXTON},
+      MAP(MAP_ROUTE11) },
+   { {TRAINER_LADY_JACKI, TRAINER_LADY_JACKI},
+      MAP(MAP_FIVE_ISLAND_RESORT_GORGEOUS) },
+   { {TRAINER_BIKER_ISAAC, TRAINER_BIKER_ISAAC},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_TEAM_ROCKET_GRUNT_19, TRAINER_TEAM_ROCKET_GRUNT_19},
+      MAP(MAP_POKEMON_TOWER_7F) },
+   { {TRAINER_COOL_COUPLE_LEX_NYA, SKIP, SKIP, SKIP, SKIP, TRAINER_COOL_COUPLE_LEX_NYA_2},
+      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
+   { {TRAINER_BIRD_KEEPER_DONALD, TRAINER_BIRD_KEEPER_DONALD},
+      MAP(MAP_ROUTE14) },
+   { {TRAINER_LASS_SALLY, TRAINER_LASS_SALLY},
+      MAP(MAP_ROUTE3) },
+   { {TRAINER_YOUNGSTER_TIMMY, TRAINER_YOUNGSTER_TIMMY_2, SKIP, TRAINER_YOUNGSTER_TIMMY_3, SKIP, TRAINER_YOUNGSTER_TIMMY_4},
+      MAP(MAP_ROUTE24) },
+   { {TRAINER_FISHERMAN_HANK, TRAINER_FISHERMAN_HANK},
+      MAP(MAP_ROUTE12) },
+   { {TRAINER_CRUSH_GIRL_SHARON, SKIP, SKIP, SKIP, TRAINER_CRUSH_GIRL_SHARON_2, TRAINER_CRUSH_GIRL_SHARON_3},
+      MAP(MAP_ONE_ISLAND_KINDLE_ROAD) },
+   { {TRAINER_BIRD_KEEPER_EDWIN, TRAINER_BIRD_KEEPER_EDWIN},
+      MAP(MAP_ROUTE15) },
+   { {TRAINER_GAMER_HUGO, TRAINER_GAMER_HUGO},
+      MAP(MAP_ROUTE11) },
+   { {TRAINER_BIKER_RUBEN, SKIP, SKIP, SKIP, TRAINER_BIKER_RUBEN_2},
+      MAP(MAP_ROUTE16) },
+   { {TRAINER_PKMN_RANGER_KATELYN, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_KATELYN_2},
+      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON) },
+   { {TRAINER_PKMN_RANGER_MADELINE, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_MADELINE_2},
+      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
+   { {TRAINER_PSYCHIC_DARIO, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_DARIO_2},
+      MAP(MAP_SEVEN_ISLAND_TRAINER_TOWER) },
+   { {TRAINER_PKMN_RANGER_NICOLAS, SKIP, SKIP, SKIP, SKIP, TRAINER_PKMN_RANGER_NICOLAS_2},
+      MAP(MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE) },
+   { {TRAINER_PSYCHIC_JACLYN, SKIP, SKIP, SKIP, SKIP, TRAINER_PSYCHIC_JACLYN_2},
+      MAP(MAP_SIX_ISLAND_GREEN_PATH) }
 };
 
 static const u8 sMovementScript_Wait48[] = {
@@ -902,7 +956,7 @@ static u8 GetVsSeekerResponseInArea(const struct RematchData * vsSeekerData)
                 else if (response == VSSEEKER_SINGLE_RESP_NO)
                     rval = 0; // Definitely no
                 // Otherwise it's a 70% chance to want a rematch
-                if (rval < 30)
+                if (FALSE)
                 {
                     StartTrainerObjectMovementScript(&sVsSeeker->trainerInfo[vsSeekerIdx], sMovementScript_TrainerNoRematch);
                     sVsSeeker->trainerDoesNotWantRematch = 1;
@@ -1012,11 +1066,12 @@ static u8 GetRematchTrainerIdGivenGameState(const u16 *trainerIdxs, u8 rematchId
 
 bool8 ShouldTryRematchBattle(void)
 {
-    if (ShouldTryRematchBattleInternal(sRematches, gTrainerBattleOpponent_A))
-    {
-        return TRUE;
-    }
-    return HasRematchTrainerAlreadyBeenFought(sRematches, gTrainerBattleOpponent_A);
+   //  if (ShouldTryRematchBattleInternal(sRematches, gTrainerBattleOpponent_A))
+   //  {
+   //      return TRUE;
+   //  }
+   //  return HasRematchTrainerAlreadyBeenFought(sRematches, gTrainerBattleOpponent_A);
+   return TRUE;
 }
 
 static bool8 ShouldTryRematchBattleInternal(const struct RematchData *vsSeekerData, u16 trainerBattleOpponent)