From b8f1162bd8a7e7a74043b747b225b39fc9120e23 Mon Sep 17 00:00:00 2001
From: infinitefusion <pkmninfinitefusion@gmail.com>
Date: Mon, 13 Nov 2023 21:41:58 -0500
Subject: [PATCH] Fixes triple fusion fight crash in randomized mode & updated
 version number

---
 Data/Map774.rxdata                            | Bin 3404 -> 3624 bytes
 Data/Scripts/001_Settings.rb                  |   2 +-
 .../010_Data/002_PBS data/013_Trainer.rb      |   1 +
 Data/System.rxdata                            | Bin 28411 -> 28411 bytes
 4 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Data/Map774.rxdata b/Data/Map774.rxdata
index 49dd1b79378ed1ca870ececcc2fb5147aee457df..d423027668a181f3d18651f3f2f25a109e8cc55d 100644
GIT binary patch
delta 239
zcmXYqyG{aO5QP^Fdoj2uLR3Uu*Bjs+FNj~I#dKC;C^i;Lw3x=<!peqMp!E%G4X@!l
z>6lQQoS8E--~80S8soeWeh<6Fkw%XBIpWNBlq)P|fuj<#l=<4Gsvb4{m?qw|_gJtz
z6_y<<F{?s7^>10znTJ^#!n#d2giZBHge|je$4+Q$`>`7s`=9EuC+t7<X<FG5+8S~p
z95@b39BJW~<Fs@)NSeJ)ixb;9HJxch$Nb!M+2_h`x<ZteAK#wy_m|{8f8|<ZdRpT~
KqseD+68r%rXf+)G

delta 17
YcmZ1>b4F@HA|w08By-lyrEHto0XRSf+W-In

diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index dbc98201d..78adfe2e0 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -6,7 +6,7 @@
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
   GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "6.0"
+  GAME_VERSION_NUMBER = "6.0.1"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
diff --git a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb
index 0a51d8edf..70473a9b7 100644
--- a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
@@ -198,6 +198,7 @@ module GameData
 
     def replace_species_to_randomized(species, trainerId, pokemonIndex)
       return species if $game_switches[SWITCH_FIRST_RIVAL_BATTLE]
+      return species if getDexNumberForSpecies(species) >= Settings::ZAPMOLCUNO_NB
       if isGymBattle() && $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY]
         return replace_species_to_randomized_gym(species, trainerId, pokemonIndex)
       end
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 335c0093cfa27310c70c74b3ed4754a4d0510710..d9157021b10990d62a4789190e00c96aab2a5a0f 100644
GIT binary patch
delta 19
bcmex;m+|*q#tm+gEQK{^SvGq~ZVUwgV5kV7

delta 19
bcmex;m+|*q#tm+gEPJw*88>@LZVUwgUJD2<