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

6.4 update (minus sprites)

Browse Source
This commit is contained in:
infinitefusion
2024-12-21 09:43:11 -05:00
parent f70c2cfde4
commit 1e325366d2
1717 changed files with 140299 additions and 27845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
View File

@@ -59,7 +59,7 @@ def pbHiddenMoveEvent
end
def pbCheckHiddenMoveBadge(badge = -1, showmsg = true)
return true if badge < 0 # No badge requirement
return true if badge < 0 || isOnPinkanIsland() # No badge requirement
return true if $DEBUG
if (Settings::FIELD_MOVES_COUNT_BADGES) ? $Trainer.badge_count >= badge : $Trainer.badges[badge]
return true
@@ -931,9 +931,14 @@ Events.onAction += proc { |_sender, _e|
Events.onAction += proc { |_sender, _e|
next if !$game_player.pbFacingTerrainTag.trashcan
if $PokemonGlobal.stepcount % 25 == 0
pbMessage(_INTL("Woah! A Pokémon jumped out of the trashcan!"))
pbWildBattle(:TRUBBISH, 10)
$PokemonGlobal.stepcount += 1
if !hatUnlocked?(HAT_CARDBOARD_BOX) && rand(2) == 0
obtainHat(HAT_CARDBOARD_BOX)
$PokemonGlobal.stepcount += 1
else
pbMessage(_INTL("Woah! A Pokémon jumped out of the trashcan!"))
pbWildBattle(:TRUBBISH, 10)
$PokemonGlobal.stepcount += 1
end
end
}