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

Fixed up code added by previous commit, improved scene closings when using Fly

Browse Source
This commit is contained in:
Maruno17
2021-10-19 22:18:55 +01:00
parent e4e8e60d28
commit e7522321ad
9 changed files with 181 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Data/Scripts/013_Items/002_Item_Effects.rb
View File

@@ -53,9 +53,15 @@ ItemHandlers::UseFromBag.add(:ITEMFINDER,proc { |item|
ItemHandlers::UseFromBag.copy(:ITEMFINDER,:DOWSINGMCHN,:DOWSINGMACHINE)
ItemHandlers::UseFromBag.add(:TOWNMAP,proc { |item|
pbShowMap(-1, false)
next ($PokemonTemp.flydata ? 2 : 0)
ItemHandlers::UseFromBag.add(:TOWNMAP, proc { |item|
pbFadeOutIn {
scene = PokemonRegionMap_Scene.new(-1, false)
screen = PokemonRegionMapScreen.new(scene)
ret = screen.pbStartScreen
$PokemonTemp.flydata = ret if ret
next 99999 if ret # Ugly hack to make Bag scene not reappear if flying
}
next $PokemonTemp.flydata ? 2 : 0
})
#===============================================================================
@@ -306,14 +312,10 @@ ItemHandlers::UseInField.add(:ITEMFINDER,proc { |item|
ItemHandlers::UseInField.copy(:ITEMFINDER,:DOWSINGMCHN,:DOWSINGMACHINE)
ItemHandlers::UseInField.add(:TOWNMAP,proc { |item|
ret = false
if !$PokemonTemp.flydata
pbShowMap(-1, false)
ret = !$PokemonTemp.flydata.nil?
end
ItemHandlers::UseInField.add(:TOWNMAP, proc { |item|
pbShowMap(-1, false) if !$PokemonTemp.flydata
pbFlyToNewLocation
next ret
next true
})
ItemHandlers::UseInField.add(:COINCASE,proc { |item|