From b41a46aacffb7db1f2afd589ca51af6fa896fefe Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sat, 8 Oct 2022 18:06:37 +0100 Subject: [PATCH] =?UTF-8?q?Fixed=20roaming=20Pok=C3=A9mon=20not=20remember?= =?UTF-8?q?ing=20whether=20they=20have=20been=20caught?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../002_Battle triggering/005_Overworld_RoamingPokemon.rb | 3 ++- .../020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb index 8ec2ad58c..c152369de 100644 --- a/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb +++ b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb @@ -6,7 +6,8 @@ class PokemonGlobalMetadata attr_writer :roamPokemonCaught def roamPokemonCaught - return @roamPokemonCaught || [] + @roamPokemonCaught = [] if !@roamPokemonCaught + return @roamPokemonCaught end end diff --git a/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb b/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb index 6182551a3..d76f36254 100644 --- a/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb +++ b/Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb @@ -511,7 +511,7 @@ def pbDebugRoamers # defeated -> caught $PokemonGlobal.roamPokemonCaught[cmdwindow.index] = true elsif pkmn[2] > 0 - # caught -> not roaming (or roaming if Switch ID is 0 + # caught -> not roaming (or roaming if Switch ID is 0) $game_switches[pkmn[2]] = false if pkmn[2] > 0 $PokemonGlobal.roamPokemon[cmdwindow.index] = nil $PokemonGlobal.roamPokemonCaught[cmdwindow.index] = false