Merge remote-tracking branch 'origin/main'

This commit is contained in:
infinitefusion
2023-05-01 20:16:53 -04:00
2 changed files with 3 additions and 2 deletions

View File

@@ -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

View File

@@ -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)
})
})