From b8df545ebd881df09df9b9799cac578322737094 Mon Sep 17 00:00:00 2001 From: RonarsCorruption <129662653+RonarsCorruption@users.noreply.github.com> Date: Fri, 14 Apr 2023 07:48:26 -0400 Subject: [PATCH 1/2] Fixing the pickup ability pickup ability was accidentally only grabbing the item by number, rather than by value. This change corrects it so it now grabs item by name. Credit to McPNorf on Reddit --- .../002_Battle triggering/001_Overworld_BattleStarting.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6f93385a4..3baee3c84 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 @@ -688,7 +688,7 @@ end def pbDynamicItemList(*args) ret = [] for i in 0...args.length - ret.push(i) if GameData::Item.exists?(args[i]) + ret.push(args[i]) if GameData::Item.exists?(args[i]) end return ret end From 387f9f58cd3258161e235d181bc6cefea92458b9 Mon Sep 17 00:00:00 2001 From: RonarsCorruption <129662653+RonarsCorruption@users.noreply.github.com> Date: Fri, 14 Apr 2023 18:18:32 -0400 Subject: [PATCH 2/2] lantern continues being active after battle Before, the lantern needs to be reactivated after each battle. Now, it remains on, just like flash! --- Data/Scripts/050_AddOns/New Items effects.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb index 9a707bb69..7ea568300 100644 --- a/Data/Scripts/050_AddOns/New Items effects.rb +++ b/Data/Scripts/050_AddOns/New Items effects.rb @@ -81,6 +81,7 @@ def useLantern() end Kernel.pbMessage(_INTL("The Lantern illuminated the cave!")) darkness.radius += 176 + $PokemonGlobal.flashUsed = true while darkness.radius < 176 Graphics.update Input.update @@ -1827,4 +1828,4 @@ ItemHandlers::BattleUseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, battl }) ItemHandlers::UseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, scene| next pbHPItem(pokemon, 50, scene) -}) \ No newline at end of file +})