From 9c8f9e943733a1f914d5273325206b2e2bd19ba7 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Sat, 1 Jul 2023 17:37:51 -0400 Subject: [PATCH] Pokemon no longer get healed in PC --- .../001_Pokemon-related/004_PokemonStorage.rb | 6 +++--- Data/Scripts/050_AddOns/New Items effects.rb | 6 +++++- Data/System.rxdata | Bin 27960 -> 27961 bytes 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb index 8916915de..3493215f8 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb @@ -194,7 +194,7 @@ class PokemonStorage raise "Trying to copy nil to storage" if !pkmn pkmn.time_form_set = nil pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN) - pkmn.heal + #pkmn.heal self[boxDst,indexDst] = pkmn end return true @@ -217,7 +217,7 @@ class PokemonStorage if box>=0 pkmn.time_form_set = nil if pkmn.time_form_set pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN) - pkmn.heal + #pkmn.heal end self[box,i] = pkmn return true @@ -230,7 +230,7 @@ class PokemonStorage if @currentBox>=0 pkmn.time_form_set = nil pkmn.form = 0 if pkmn.isSpecies?(:SHAYMIN) - pkmn.heal + #pkmn.heal end for i in 0...maxPokemon(@currentBox) if self[@currentBox,i]==nil diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb index 65692b94f..0927d97cf 100644 --- a/Data/Scripts/050_AddOns/New Items effects.rb +++ b/Data/Scripts/050_AddOns/New Items effects.rb @@ -1875,7 +1875,11 @@ ItemHandlers::UseInField.add(:BOXLINK, proc { |item| if blacklisted_maps.include?($game_map.map_id) Kernel.pbMessage("There doesn't seem to be any network coverage here...") else - pbPokeCenterPC() + pbFadeOutIn { + scene = PokemonStorageScene.new + screen = PokemonStorageScreen.new(scene,$PokemonStorage) + screen.pbStartScreen(0) #Boot PC in organize mode + } end next 1 }) \ No newline at end of file diff --git a/Data/System.rxdata b/Data/System.rxdata index 0ab40fff111cbbd83533de8b498a74a3019d4957..147c3ffdda5954c6cd1fa12c46b2b3303452e962 100644 GIT binary patch delta 33 pcmdmSi*e^I#trW!_*fh(m$6v!JERsTCl;hmR>+dvEGnrS0s!Mt3*7(! delta 32 ocmdmai*d&-#trW!c$rts<+b8>NG(oIEJ&TKm?gPcOj0=n0Nj2H%K!iX