From 433cb999ffee7f8c236f22c3f04db0d92d938e79 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Tue, 14 Nov 2023 20:06:51 -0500 Subject: [PATCH] fixes crash when trying to unfuse a triple fusion --- Data/Scripts/050_AddOns/New Items effects.rb | 10 +++++----- Data/System.rxdata | Bin 28411 -> 28411 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb index 91e4f389c..f4af1a7b9 100644 --- a/Data/Scripts/050_AddOns/New Items effects.rb +++ b/Data/Scripts/050_AddOns/New Items effects.rb @@ -1471,6 +1471,11 @@ def pbFuse(pokemon, poke2, splicer_item) end def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil) + if pokemon.species_data.id_number > (NB_POKEMON * NB_POKEMON) + NB_POKEMON #triple fusion + scene.pbDisplay(_INTL("{1} cannot be unfused.", pokemon.name)) + return false + end + pokemon.spriteform_body=nil pokemon.spriteform_head=nil @@ -1482,11 +1487,6 @@ def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil) return false else if Kernel.pbConfirmMessageSerious(_INTL("Should {1} be unfused?", pokemon.name)) - if pokemon.species_data.id_number > (NB_POKEMON * NB_POKEMON) + NB_POKEMON #triple fusion - scene.pbDisplay(_INTL("{1} cannot be unfused.", pokemon.name)) - return false - end - keepInParty = 0 if $Trainer.party.length >= 6 && !pcPosition scene.pbDisplay(_INTL("Your party is full! Keep which Pokémon in party?")) diff --git a/Data/System.rxdata b/Data/System.rxdata index e4a140a4a21eb3245078438205893e7353e051e8..e7711ee80ff793ccc0ba3f72c6cbd9be10e80e01 100644 GIT binary patch delta 19 bcmex;m+|*q#tm+gEbAtpWZCQ`xiJ&~V`&KR delta 19 bcmex;m+|*q#tm+gEOK{?nKpY#ZVUwgUPA~{