From 263521740770131d37d614f4dd823d7d578ddb40 Mon Sep 17 00:00:00 2001
From: infinitefusion <pkmninfinitefusion@gmail.com>
Date: Tue, 14 Nov 2023 18:46:32 -0500
Subject: [PATCH] error handling in case the randomizer picks a pokemon that
 does not exist

---
 Data/Map801.rxdata                            | Bin 5526 -> 5526 bytes
 .../001_Overworld_BattleStarting.rb           |   6 +++++-
 Data/Scripts/050_AddOns/GameplayUtils.rb      |   7 +++++--
 Data/Scripts/050_AddOns/Trainers Rebattle.rb  |   3 +--
 Data/System.rxdata                            | Bin 28411 -> 28411 bytes
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Data/Map801.rxdata b/Data/Map801.rxdata
index 3305f0dd82c52fa29444b5780c88bcc4e7b442ea..fd67619ed0269535a7ed9a4e0f510260e9bf593a 100644
GIT binary patch
delta 632
zcmaiw%}N4M6vt;qXU1>GFC>W6$tlGI39a;OglL3zfwh^1NltJ;9m(m#P2dxlT<`^2
zw(JpF)l2jWZEI6koe8w4#pQC(J?Gxv??1^+a(Bn$R(bqzRFhl~(p<<rakIrh7#WD*
ztpT$e`^;2=)sAtcH_Sm#N2U^~w(vqfGtuZa&hbViY4(MDvI#aw5?q`QY4i~STuq8p
zo9*l7px>a4rqNT$kQ<SdqZajfz^@4g1i}#1eDm+fn<Flvg}{DT#d}9SIj3S@Ei3`^
zR+sTTxe~FOtT|1*gfdxmrVIZKQ`mV615s)pBRyv>n=(LlQ8bFUF4ByqsW6aML8-$A
zx?xj=47wnzl0!i$)uBiaB^BJV=isDJ*oGYpz%H%rp@?n+7IeK9w9L!VU!WCo%Ew5D
z5A6RS_b+N|USzO~Yv`f7U<dbXr8EsdAwwxCqu0K(6I@bO$vdCT{HZJ~DsL?-7pZcB
ZDtoB1yCPLhZ0mj9Y+wtO$B`fgzW}+=mX`nk

delta 627
zcmaiwO-lk%6ozL;9d%4+Mh%Ie%p6lpkg_iig-}hc!`jSZkeuLvIg-<dn;>Z0hurXw
z^b=aupNM`yv~Sf_uTmJbxLnRT@8P`9+sSsa_xmBG<Y3KeT8@cT)Y|1@P%a(YXO`)-
z8WwWxo4s_{2NA=E!jsT@97K_WalEvlHyP9%N%1dAq*TQd>(D{FZXV%<PCocJuM$Ow
zc_Ic~BlE%zxfX7zuu?m(w3;RrI(9=Rs%tkIlpth?HppR6jj{d#^5%*u$d2-#toh)|
z#rr<^S7t=S98=lD&4~yTu|30k3PlohC-eU;Q?q>u2MXn#Ar*Hvov>lnN3BtdNiR*M
zn*#@$4yiKCp&!yZWY7nTWL?yXg)%JBVp#`&LfSsa=NDiFL$FGFYv@J44c~CPH&i3Q
zjLV+Hug14L$;}bt!JpJd06DDV6iW0L2f017kh=UDxl-bj7#Pe30S<}DyC*|Y{-zZf
ZE!hyYxDF$<1xh<jX(dYQf4mdD@)zr3lzjjI

diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
index 6ae56edb4..bddded9a9 100644
--- a/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb	
+++ b/Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb	
@@ -340,7 +340,11 @@ def pbWildBattle(species, level, outcomeVar=1, canRun=true, canLose=false)
   dexnum = getDexNumberForSpecies(species)
   if $game_switches[SWITCH_RANDOM_STATIC_ENCOUNTERS] && dexnum <= NB_POKEMON
     newSpecies = $PokemonGlobal.psuedoBSTHash[dexnum]
-    species = getSpecies(newSpecies)
+    if !newSpecies
+      displayRandomizerErrorMessage()
+    else
+      species = getSpecies(newSpecies)
+    end
   end
 
   # Potentially call a different pbWildBattle-type method instead (for roaming
diff --git a/Data/Scripts/050_AddOns/GameplayUtils.rb b/Data/Scripts/050_AddOns/GameplayUtils.rb
index e5310d03b..55db378e4 100644
--- a/Data/Scripts/050_AddOns/GameplayUtils.rb
+++ b/Data/Scripts/050_AddOns/GameplayUtils.rb
@@ -700,8 +700,11 @@ def regirock_steel_move_boulder()
     pbSEPlay("Entering Door")
     pbSetSelfSwitch(switch_event.id, "A", true) if switch_event
   end
-
-
 end
 
 
+def displayRandomizerErrorMessage()
+  Kernel.pbMessage(_INTL("The randomizer has encountered an error. You should try to re-randomize your game as soon as possible."))
+  Kernel.pbMessage(_INTL("You can do this on the top floor of Pokémon Centers."))
+end
+
diff --git a/Data/Scripts/050_AddOns/Trainers Rebattle.rb b/Data/Scripts/050_AddOns/Trainers Rebattle.rb
index 062874315..a7d1c28be 100644
--- a/Data/Scripts/050_AddOns/Trainers Rebattle.rb	
+++ b/Data/Scripts/050_AddOns/Trainers Rebattle.rb	
@@ -214,8 +214,7 @@ def getFusionSpeciesSymbol(body, head)
   nb_pokemon = Settings::NB_POKEMON
   id = body_num * nb_pokemon + head_num
   if id > (nb_pokemon*nb_pokemon)+nb_pokemon
-    Kernel.pbMessage(_INTL("The randomizer has encountered an error. You should try to re-randomize your game as soon as possible."))
-    Kernel.pbMessage(_INTL("You can do this on the top floor of Pokémon Centers."))
+    displayRandomizerErrorMessage()
     return body
   end
 
diff --git a/Data/System.rxdata b/Data/System.rxdata
index f7c5f178533c8e3bc1d22a2904becc4037b09d6d..db5d49e1f8d1ac58a7b59d234ad8f2a52d53b8a8 100644
GIT binary patch
delta 26
icmex;m+|*q#tm+gEH@ZeGHv#f><D61+<ZA(gBbv!)Czb2

delta 26
icmex;m+|*q#tm+gEMIyPST=h}b_6l9ZN8kX!3+SWLJGbB