DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'e19-release-beta1-storyRevamp' into e19-release-beta1

Browse Source 
# Conflicts:
#	Data/CommonEvents.rxdata
#	Data/Map019.rxdata
#	Data/Map058.rxdata
#	Data/Map154.rxdata
#	Data/Map208.rxdata
#	Data/Map561.rxdata
#	Data/Map721.rxdata
#	Data/MapInfos.rxdata
#	Data/Scripts/025-Randomizer/RandomizerUtils.rb
#	Data/System.rxdata
This commit is contained in:
infinitefusion
2022-06-09 18:30:16 -04:00
parent 625c7f94d9 9a215a0947
commit ca8e35083c
25 changed files with 16 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/050_AddOns/Autosave.rb
View File

@@ -18,7 +18,9 @@ def pbSetPokemonCenter
end
def Kernel.Autosave
#showSaveIcon()
pbSave(false)
#hideSaveIcon()
end

31
Data/Scripts/050_AddOns/New Items effects.rb
View File

@@ -219,22 +219,6 @@ ItemHandlers::UseFromBag.add(:LANTERN, proc { |item|
next true
})
ItemHandlers::UseFromBag.add(:AZUREFLUTE, proc { |item|
if Kernel.pbConfirmMessage(_INTL("Play the Azure Flute?"))
Kernel.pbMessage(_INTL("You blew into the Azure Flute."))
if $game_map.map_id == 694
Kernel.pbMessage(_INTL("A strange sound echoed from the sky..."))
$game_switches[469] = true
next true
else
Kernel.pbMessage(_INTL("But nothing happened..."))
next false
end
#Kernel.pbMessage(_INTL("{1} was transported somewhere...",$Trainer.name))
#Kernel.pbTransfer(376,14,51)
end
return false
})
ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
if pokemon.gender == 0
@@ -994,22 +978,7 @@ ItemHandlers::UseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, scene|
next pbHPItem(pokemon, 50, scene)
})
ItemHandlers::UseFromBag.add(:AZUREFLUTE, proc { |item|
if Kernel.pbConfirmMessage(_INTL("Play the Azure Flute?"))
Kernel.pbMessage(_INTL("You blew into the Azure Flute."))
if pbGet(222) >= 30 #if very good karma
Kernel.pbMessage(_INTL("A strange sound echoed from the sky..."))
Kernel.pbMessage(_INTL("{1} was transported somewhere...", $Trainer.name))
Kernel.pbTransfer(376, 14, 51)
next true
else
Kernel.pbMessage(_INTL("But nothing happened..."))
next false
end
end
return false
})
ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
if pokemon.gender == 0