diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 7967a5432..41edc8e26 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index b5413ec5f..b9a6bc5fe 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 2249bec14..901f2bb2b 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 632925ac7..d83bead15 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index 004ee903d..be622f513 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index 3e62ba6d2..fe767fa0b 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map063.rxdata b/Data/Map063.rxdata index f205cd80f..418d1461d 100644 Binary files a/Data/Map063.rxdata and b/Data/Map063.rxdata differ diff --git a/Data/Map095.rxdata b/Data/Map095.rxdata index 90739e1ce..3ed843207 100644 Binary files a/Data/Map095.rxdata and b/Data/Map095.rxdata differ diff --git a/Data/Map337.rxdata b/Data/Map337.rxdata index e2457f08e..a5896cc4a 100644 Binary files a/Data/Map337.rxdata and b/Data/Map337.rxdata differ diff --git a/Data/Map341.rxdata b/Data/Map341.rxdata index 2e42739f2..8f6733cac 100644 Binary files a/Data/Map341.rxdata and b/Data/Map341.rxdata differ diff --git a/Data/Map611.rxdata b/Data/Map611.rxdata index 8d002b7cc..d98ca2a77 100644 Binary files a/Data/Map611.rxdata and b/Data/Map611.rxdata differ diff --git a/Data/Map619.rxdata b/Data/Map619.rxdata index e9ee38b59..2ce336eb8 100644 Binary files a/Data/Map619.rxdata and b/Data/Map619.rxdata differ diff --git a/Data/Map638.rxdata b/Data/Map638.rxdata index b5968d8fb..711d5ebb7 100644 Binary files a/Data/Map638.rxdata and b/Data/Map638.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 66daa48cd..77a4c8196 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/002_BattleSettings.rb b/Data/Scripts/002_BattleSettings.rb index 11af23cd0..271b0d273 100644 --- a/Data/Scripts/002_BattleSettings.rb +++ b/Data/Scripts/002_BattleSettings.rb @@ -9,13 +9,13 @@ module Settings # Whether critical hits do 1.5x damage and have 4 stages (true), or they do 2x # damage and have 5 stages as in Gen 5 (false). Also determines whether # critical hit rate can be copied by Transform/Psych Up. - NEW_CRITICAL_HIT_RATE_MECHANICS = (MECHANICS_GENERATION >= 6) + NEW_CRITICAL_HIT_RATE_MECHANICS = (MECHANICS_GENERATION >= 5) # Whether several effects apply relating to a Pokémon's type: # * Electric-type immunity to paralysis # * Ghost-type immunity to being trapped # * Grass-type immunity to powder moves and Effect Spore # * Poison-type Pokémon can't miss when using Toxic - MORE_TYPE_EFFECTS = (MECHANICS_GENERATION >= 6) + MORE_TYPE_EFFECTS = (MECHANICS_GENERATION >= 5) # Whether weather caused by an ability lasts 5 rounds (true) or forever (false). FIXED_DURATION_WEATHER_FROM_ABILITY = (MECHANICS_GENERATION >= 6) @@ -66,7 +66,7 @@ module Settings # fewer species in your game. ENABLE_CRITICAL_CAPTURES = (MECHANICS_GENERATION >= 5) # Whether Pokémon gain Exp for capturing a Pokémon. - GAIN_EXP_FOR_CAPTURE = (MECHANICS_GENERATION >= 6) + GAIN_EXP_FOR_CAPTURE = (MECHANICS_GENERATION >= 5) # The Game Switch which, whie ON, prevents the player from losing money if # they lose a battle (they can still gain money from trainers for winning). NO_MONEY_LOSS = 33 diff --git a/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb b/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb index bea01266e..62cfb3108 100644 --- a/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb +++ b/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb @@ -83,7 +83,7 @@ module PokeBattle_BattleCommon if itemName.starts_with_vowel? pbDisplay(_INTL("{1} threw an {2}!",pbPlayer.name,itemName)) else - pbDisplay(_INTL("{1} vcthrew a {2}!",pbPlayer.name,itemName)) + pbDisplay(_INTL("{1} threw a {2}!",pbPlayer.name,itemName)) end pbDisplay(_INTL("But there was no target...")) return diff --git a/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb b/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb index dcdd7c0a2..b4d2ed93a 100644 --- a/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb +++ b/Data/Scripts/011_Battle/003_Battle/004_Battle_ExpAndMoveLearning.rb @@ -158,7 +158,7 @@ class PokeBattle_Battle if showMessages if isOutsider pbDisplayPaused(_INTL("{1} got a boosted {2} Exp. Points!",pkmn.name,expGained)) - else + elsepbGenerateEgg pbDisplayPaused(_INTL("{1} got {2} Exp. Points!",pkmn.name,expGained)) end end diff --git a/Data/Scripts/011_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb b/Data/Scripts/011_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb index cadbfad68..247d5856c 100644 --- a/Data/Scripts/011_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb +++ b/Data/Scripts/011_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb @@ -643,7 +643,7 @@ class BattlerFaintAnimation < PokeBattle_Animation super(sprites,viewport) end - def createProcessesPB + def createProcesses batSprite = @sprites["pokemon_#{@idxBattler}"] shaSprite = @sprites["shadow_#{@idxBattler}"] # Set up battler/shadow sprite @@ -655,7 +655,7 @@ class BattlerFaintAnimation < PokeBattle_Animation @battle.pbSideSize(@idxBattler))[1] cropY += 8 duration = (cropY-battlerTop)/8 - duration = 10 if duration<10 # Min 0.5 seconds + duration = 5#10 if duration<10 # Min 0.5 seconds # Animation # Play cry delay = 10 diff --git a/Data/Scripts/012_Overworld/001_Overworld.rb b/Data/Scripts/012_Overworld/001_Overworld.rb index f8f65fe05..01510d082 100644 --- a/Data/Scripts/012_Overworld/001_Overworld.rb +++ b/Data/Scripts/012_Overworld/001_Overworld.rb @@ -155,7 +155,7 @@ Events.onStepTakenFieldMovement += proc { |_sender, e| end if event == $game_player currentTag = $game_player.pbTerrainTag - if currentTag.waterfall_crest + if currentTag.waterfall_crest || currentTag.waterfall pbDescendWaterfall elsif currentTag.ice && !$PokemonGlobal.sliding pbSlideOnIce diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb index 5b7c05700..56559cd4f 100644 --- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb +++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb @@ -2,49 +2,55 @@ # Hidden move handlers #=============================================================================== module HiddenMoveHandlers - CanUseMove = MoveHandlerHash.new + CanUseMove = MoveHandlerHash.new ConfirmUseMove = MoveHandlerHash.new - UseMove = MoveHandlerHash.new + UseMove = MoveHandlerHash.new - def self.addCanUseMove(item,proc); CanUseMove.add(item,proc); end - def self.addConfirmUseMove(item,proc); ConfirmUseMove.add(item,proc); end - def self.addUseMove(item,proc); UseMove.add(item,proc); end + def self.addCanUseMove(item, proc) + ; CanUseMove.add(item, proc); + end + + def self.addConfirmUseMove(item, proc) + ; ConfirmUseMove.add(item, proc); + end + + def self.addUseMove(item, proc) + ; UseMove.add(item, proc); + end def self.hasHandler(item) - return CanUseMove[item]!=nil && UseMove[item]!=nil + return CanUseMove[item] != nil && UseMove[item] != nil end # Returns whether move can be used - def self.triggerCanUseMove(item,pokemon,showmsg) + def self.triggerCanUseMove(item, pokemon, showmsg) return false if !CanUseMove[item] - return CanUseMove.trigger(item,pokemon,showmsg) + return CanUseMove.trigger(item, pokemon, showmsg) end # Returns whether the player confirmed that they want to use the move - def self.triggerConfirmUseMove(item,pokemon) + def self.triggerConfirmUseMove(item, pokemon) return true if !ConfirmUseMove[item] - return ConfirmUseMove.trigger(item,pokemon) + return ConfirmUseMove.trigger(item, pokemon) end # Returns whether move was used - def self.triggerUseMove(item,pokemon) + def self.triggerUseMove(item, pokemon) return false if !UseMove[item] - return UseMove.trigger(item,pokemon) + return UseMove.trigger(item, pokemon) end end - - -def pbCanUseHiddenMove?(pkmn,move,showmsg=true) - return HiddenMoveHandlers.triggerCanUseMove(move,pkmn,showmsg) +def pbCanUseHiddenMove?(pkmn, move, showmsg = true) + return HiddenMoveHandlers.triggerCanUseMove(move, pkmn, showmsg) end -def pbConfirmUseHiddenMove(pokemon,move) - return HiddenMoveHandlers.triggerConfirmUseMove(move,pokemon) +def pbConfirmUseHiddenMove(pokemon, move) + return HiddenMoveHandlers.triggerConfirmUseMove(move, pokemon) end -def pbUseHiddenMove(pokemon,move) - return HiddenMoveHandlers.triggerUseMove(move,pokemon) +def pbUseHiddenMove(pokemon, move) + return HiddenMoveHandlers.triggerUseMove(move, pokemon) end # Unused @@ -52,8 +58,8 @@ def pbHiddenMoveEvent Events.onAction.trigger(nil) end -def pbCheckHiddenMoveBadge(badge=-1,showmsg=true) - return true if badge<0 # No badge requirement +def pbCheckHiddenMoveBadge(badge = -1, showmsg = true) + return true if badge < 0 # No badge requirement return true if $DEBUG if (Settings::FIELD_MOVES_COUNT_BADGES) ? $Trainer.badge_count >= badge : $Trainer.badges[badge] return true @@ -62,113 +68,112 @@ def pbCheckHiddenMoveBadge(badge=-1,showmsg=true) return false end - - #=============================================================================== # Hidden move animation #=============================================================================== def pbHiddenMoveAnimation(pokemon) return false if !pokemon - viewport=Viewport.new(0,0,0,0) - viewport.z=99999 - bg=Sprite.new(viewport) - bg.bitmap=RPG::Cache.picture("hiddenMovebg") - sprite=PokemonSprite.new(viewport) + viewport = Viewport.new(0, 0, 0, 0) + viewport.z = 99999 + bg = Sprite.new(viewport) + bg.bitmap = RPG::Cache.picture("hiddenMovebg") + sprite = PokemonSprite.new(viewport) sprite.setOffset(PictureOrigin::Center) sprite.setPokemonBitmap(pokemon) - sprite.z=1 - sprite.visible=false - strobebitmap=AnimatedBitmap.new("Graphics/Pictures/hiddenMoveStrobes") - strobes=[] + sprite.z = 1 + sprite.visible = false + strobebitmap = AnimatedBitmap.new("Graphics/Pictures/hiddenMoveStrobes") + strobes = [] 15.times do |i| - strobe=BitmapSprite.new(26*2,8*2,viewport) - strobe.bitmap.blt(0,0,strobebitmap.bitmap,Rect.new(0,(i%2)*8*2,26*2,8*2)) - strobe.z=((i%2)==0 ? 2 : 0) - strobe.visible=false + strobe = BitmapSprite.new(26 * 2, 8 * 2, viewport) + strobe.bitmap.blt(0, 0, strobebitmap.bitmap, Rect.new(0, (i % 2) * 8 * 2, 26 * 2, 8 * 2)) + strobe.z = ((i % 2) == 0 ? 2 : 0) + strobe.visible = false strobes.push(strobe) end strobebitmap.dispose - interp=RectInterpolator.new( - Rect.new(0,Graphics.height/2,Graphics.width,0), - Rect.new(0,(Graphics.height-bg.bitmap.height)/2,Graphics.width,bg.bitmap.height), - Graphics.frame_rate/4) - ptinterp=nil - phase=1 - frames=0 - strobeSpeed = 64*20/Graphics.frame_rate + interp = RectInterpolator.new( + Rect.new(0, Graphics.height / 2, Graphics.width, 0), + Rect.new(0, (Graphics.height - bg.bitmap.height) / 2, Graphics.width, bg.bitmap.height), + Graphics.frame_rate / 4) + ptinterp = nil + phase = 1 + frames = 0 + strobeSpeed = 64 * 20 / Graphics.frame_rate loop do Graphics.update Input.update sprite.update case phase - when 1 # Expand viewport height from zero to full + when 1 # Expand viewport height from zero to full interp.update interp.set(viewport.rect) - bg.oy=(bg.bitmap.height-viewport.rect.height)/2 + bg.oy = (bg.bitmap.height - viewport.rect.height) / 2 if interp.done? - phase=2 - ptinterp=PointInterpolator.new( - Graphics.width+(sprite.bitmap.width/2),bg.bitmap.height/2, - Graphics.width/2,bg.bitmap.height/2, - Graphics.frame_rate*4/10) + phase = 2 + ptinterp = PointInterpolator.new( + Graphics.width + (sprite.bitmap.width / 2), bg.bitmap.height / 2, + Graphics.width / 2, bg.bitmap.height / 2, + Graphics.frame_rate * 4 / 10) end - when 2 # Slide Pokémon sprite in from right to centre + when 2 # Slide Pokémon sprite in from right to centre ptinterp.update - sprite.x=ptinterp.x - sprite.y=ptinterp.y - sprite.visible=true + sprite.x = ptinterp.x + sprite.y = ptinterp.y + sprite.visible = true if ptinterp.done? - phase=3 + phase = 3 pokemon.play_cry - frames=0 + frames = 0 end - when 3 # Wait - frames+=1 - if frames>Graphics.frame_rate*3/4 - phase=4 - ptinterp=PointInterpolator.new( - Graphics.width/2,bg.bitmap.height/2, - -(sprite.bitmap.width/2),bg.bitmap.height/2, - Graphics.frame_rate*4/10) - frames=0 + when 3 # Wait + frames += 1 + if frames > Graphics.frame_rate * 3 / 4 + phase = 4 + ptinterp = PointInterpolator.new( + Graphics.width / 2, bg.bitmap.height / 2, + -(sprite.bitmap.width / 2), bg.bitmap.height / 2, + Graphics.frame_rate * 4 / 10) + frames = 0 end - when 4 # Slide Pokémon sprite off from centre to left + when 4 # Slide Pokémon sprite off from centre to left ptinterp.update - sprite.x=ptinterp.x - sprite.y=ptinterp.y + sprite.x = ptinterp.x + sprite.y = ptinterp.y if ptinterp.done? - phase=5 - sprite.visible=false - interp=RectInterpolator.new( - Rect.new(0,(Graphics.height-bg.bitmap.height)/2,Graphics.width,bg.bitmap.height), - Rect.new(0,Graphics.height/2,Graphics.width,0), - Graphics.frame_rate/4) + phase = 5 + sprite.visible = false + interp = RectInterpolator.new( + Rect.new(0, (Graphics.height - bg.bitmap.height) / 2, Graphics.width, bg.bitmap.height), + Rect.new(0, Graphics.height / 2, Graphics.width, 0), + Graphics.frame_rate / 4) end - when 5 # Shrink viewport height from full to zero + when 5 # Shrink viewport height from full to zero interp.update interp.set(viewport.rect) - bg.oy=(bg.bitmap.height-viewport.rect.height)/2 - phase=6 if interp.done? + bg.oy = (bg.bitmap.height - viewport.rect.height) / 2 + phase = 6 if interp.done? end # Constantly stream the strobes across the screen for strobe in strobes - strobe.ox=strobe.viewport.rect.x - strobe.oy=strobe.viewport.rect.y - if !strobe.visible # Initial placement of strobes - randomY = 16*(1+rand(bg.bitmap.height/16-2)) - strobe.y = randomY+(Graphics.height-bg.bitmap.height)/2 + strobe.ox = strobe.viewport.rect.x + strobe.oy = strobe.viewport.rect.y + if !strobe.visible # Initial placement of strobes + randomY = 16 * (1 + rand(bg.bitmap.height / 16 - 2)) + strobe.y = randomY + (Graphics.height - bg.bitmap.height) / 2 strobe.x = rand(Graphics.width) strobe.visible = true - elsif strobe.xdarkness.radiusMax + darkness.radius = darkness.radiusMax if darkness.radius > darkness.radiusMax end next true }) - - #=============================================================================== -# Fly +# Fly / Teleport #=============================================================================== -HiddenMoveHandlers::CanUseMove.add(:FLY,proc { |move,pkmn,showmsg| - next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_FLY,showmsg) +HiddenMoveHandlers::CanUseMove.add(:FLY, proc { |move, pkmn, showmsg| + next pbCanUseFly(showmsg) +}) +HiddenMoveHandlers::CanUseMove.add(:TELEPORT, proc { |move, pkmn, showmsg| + next pbCanUseFly(showmsg) +}) + +HiddenMoveHandlers::UseMove.add(:FLY, proc { |move, pokemon| + next pbFly(move, pokemon) +}) +HiddenMoveHandlers::UseMove.add(:TELEPORT, proc { |move, pokemon| + next pbFly(move, pokemon) +}) + +def pbCanUseFly(showmsg) + return false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_TELEPORT, showmsg) if $game_player.pbHasDependentEvents? pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg - next false + return false end if !GameData::MapMetadata.exists?($game_map.map_id) || - !GameData::MapMetadata.get($game_map.map_id).outdoor_map + !GameData::MapMetadata.get($game_map.map_id).outdoor_map pbMessage(_INTL("Can't use that here.")) if showmsg - next false + return false end - next true -}) + return true +end -HiddenMoveHandlers::UseMove.add(:FLY,proc { |move,pokemon| +def pbFly(move, pokemon) if !$PokemonTemp.flydata pbMessage(_INTL("Can't use that here.")) - next false + return false end if !pbHiddenMoveAnimation(pokemon) - pbMessage(_INTL("{1} used {2}!",pokemon.name,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", pokemon.name, GameData::Move.get(move).name)) end pbFadeOutIn { - $game_temp.player_new_map_id = $PokemonTemp.flydata[0] - $game_temp.player_new_x = $PokemonTemp.flydata[1] - $game_temp.player_new_y = $PokemonTemp.flydata[2] + $game_temp.player_new_map_id = $PokemonTemp.flydata[0] + $game_temp.player_new_x = $PokemonTemp.flydata[1] + $game_temp.player_new_y = $PokemonTemp.flydata[2] $game_temp.player_new_direction = 2 $PokemonTemp.flydata = nil $scene.transfer_player @@ -528,35 +537,36 @@ HiddenMoveHandlers::UseMove.add(:FLY,proc { |move,pokemon| $game_map.refresh } pbEraseEscapePoint - next true -}) - - + return true +end #=============================================================================== # Headbutt #=============================================================================== -def pbHeadbuttEffect(event=nil) +def pbHeadbuttEffect(event = nil) event = $game_player.pbFacingEvent(true) if !event - a = (event.x+(event.x/24).floor+1)*(event.y+(event.y/24).floor+1) - a = (a*2/5)%10 # Even 2x as likely as odd, 0 is 1.5x as likely as odd - b = $Trainer.public_ID % 10 # Practically equal odds of each value - chance = 1 # ~50% - if a==b; chance = 8 # 10% - elsif a>b && (a-b).abs<5; chance = 5 # ~30.3% - elsif a5; chance = 5 # ~9.7% + a = (event.x + (event.x / 24).floor + 1) * (event.y + (event.y / 24).floor + 1) + a = (a * 2 / 5) % 10 # Even 2x as likely as odd, 0 is 1.5x as likely as odd + b = $Trainer.public_ID % 10 # Practically equal odds of each value + chance = 1 # ~50% + if a == b; + chance = 8 # 10% + elsif a > b && (a - b).abs < 5; + chance = 5 # ~30.3% + elsif a < b && (a - b).abs > 5; + chance = 5 # ~9.7% end - if rand(10)>=chance + if rand(10) >= chance pbMessage(_INTL("Nope. Nothing...")) else - enctype = (chance==1) ? :HeadbuttLow : :HeadbuttHigh + enctype = (chance == 1) ? :HeadbuttLow : :HeadbuttHigh if !pbEncounter(enctype) pbMessage(_INTL("Nope. Nothing...")) end end end -def pbHeadbutt(event=nil) +def pbHeadbutt(event = nil) move = :HEADBUTT movefinder = $Trainer.get_pokemon_with_move(move) if !$DEBUG && !movefinder @@ -565,7 +575,7 @@ def pbHeadbutt(event=nil) end if pbConfirmMessage(_INTL("A Pokémon could be in this tree. Would you like to use Headbutt?")) speciesname = (movefinder) ? movefinder.name : $Trainer.name - pbMessage(_INTL("{1} used {2}!",speciesname,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name)) pbHiddenMoveAnimation(movefinder) pbHeadbuttEffect(event) return true @@ -573,7 +583,7 @@ def pbHeadbutt(event=nil) return false end -HiddenMoveHandlers::CanUseMove.add(:HEADBUTT,proc { |move,pkmn,showmsg| +HiddenMoveHandlers::CanUseMove.add(:HEADBUTT, proc { |move, pkmn, showmsg| facingEvent = $game_player.pbFacingEvent if !facingEvent || !facingEvent.name[/headbutttree/i] pbMessage(_INTL("Can't use that here.")) if showmsg @@ -582,16 +592,14 @@ HiddenMoveHandlers::CanUseMove.add(:HEADBUTT,proc { |move,pkmn,showmsg| next true }) -HiddenMoveHandlers::UseMove.add(:HEADBUTT,proc { |move,pokemon| +HiddenMoveHandlers::UseMove.add(:HEADBUTT, proc { |move, pokemon| if !pbHiddenMoveAnimation(pokemon) - pbMessage(_INTL("{1} used {2}!",pokemon.name,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", pokemon.name, GameData::Move.get(move).name)) end facingEvent = $game_player.pbFacingEvent pbHeadbuttEffect(facingEvent) }) - - #=============================================================================== # Rock Smash #=============================================================================== @@ -604,21 +612,21 @@ end def pbRockSmash move = :ROCKSMASH movefinder = $Trainer.get_pokemon_with_move(move) - if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_ROCKSMASH,false) || (!$DEBUG && !movefinder) + if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_ROCKSMASH, false) || (!$DEBUG && !movefinder) pbMessage(_INTL("It's a rugged rock, but a Pokémon may be able to smash it.")) return false end if pbConfirmMessage(_INTL("This rock appears to be breakable. Would you like to use Rock Smash?")) speciesname = (movefinder) ? movefinder.name : $Trainer.name - pbMessage(_INTL("{1} used {2}!",speciesname,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name)) pbHiddenMoveAnimation(movefinder) return true end return false end -HiddenMoveHandlers::CanUseMove.add(:ROCKSMASH,proc { |move,pkmn,showmsg| - next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_ROCKSMASH,showmsg) +HiddenMoveHandlers::CanUseMove.add(:ROCKSMASH, proc { |move, pkmn, showmsg| + next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_ROCKSMASH, showmsg) facingEvent = $game_player.pbFacingEvent if !facingEvent || !facingEvent.name[/smashrock/i] pbMessage(_INTL("Can't use that here.")) if showmsg @@ -627,9 +635,9 @@ HiddenMoveHandlers::CanUseMove.add(:ROCKSMASH,proc { |move,pkmn,showmsg| next true }) -HiddenMoveHandlers::UseMove.add(:ROCKSMASH,proc { |move,pokemon| +HiddenMoveHandlers::UseMove.add(:ROCKSMASH, proc { |move, pokemon| if !pbHiddenMoveAnimation(pokemon) - pbMessage(_INTL("{1} used {2}!",pokemon.name,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", pokemon.name, GameData::Move.get(move).name)) end facingEvent = $game_player.pbFacingEvent if facingEvent @@ -639,8 +647,6 @@ HiddenMoveHandlers::UseMove.add(:ROCKSMASH,proc { |move,pokemon| next true }) - - #=============================================================================== # Strength #=============================================================================== @@ -651,29 +657,29 @@ def pbStrength end move = :STRENGTH movefinder = $Trainer.get_pokemon_with_move(move) - if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_STRENGTH,false) || (!$DEBUG && !movefinder) + if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_STRENGTH, false) || (!$DEBUG && !movefinder) pbMessage(_INTL("It's a big boulder, but a Pokémon may be able to push it aside.")) return false end pbMessage(_INTL("It's a big boulder, but a Pokémon may be able to push it aside.\1")) if pbConfirmMessage(_INTL("Would you like to use Strength?")) speciesname = (movefinder) ? movefinder.name : $Trainer.name - pbMessage(_INTL("{1} used {2}!",speciesname,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name)) pbHiddenMoveAnimation(movefinder) - pbMessage(_INTL("{1}'s Strength made it possible to move boulders around!",speciesname)) + pbMessage(_INTL("{1}'s Strength made it possible to move boulders around!", speciesname)) $PokemonMap.strengthUsed = true return true end return false end -Events.onAction += proc { |_sender,_e| +Events.onAction += proc { |_sender, _e| facingEvent = $game_player.pbFacingEvent pbStrength if facingEvent && facingEvent.name[/strengthboulder/i] } -HiddenMoveHandlers::CanUseMove.add(:STRENGTH,proc { |move,pkmn,showmsg| - next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_STRENGTH,showmsg) +HiddenMoveHandlers::CanUseMove.add(:STRENGTH, proc { |move, pkmn, showmsg| + next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_STRENGTH, showmsg) if $PokemonMap.strengthUsed pbMessage(_INTL("Strength is already being used.")) if showmsg next false @@ -681,17 +687,15 @@ HiddenMoveHandlers::CanUseMove.add(:STRENGTH,proc { |move,pkmn,showmsg| next true }) -HiddenMoveHandlers::UseMove.add(:STRENGTH,proc { |move,pokemon| +HiddenMoveHandlers::UseMove.add(:STRENGTH, proc { |move, pokemon| if !pbHiddenMoveAnimation(pokemon) - pbMessage(_INTL("{1} used {2}!\1",pokemon.name,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!\1", pokemon.name, GameData::Move.get(move).name)) end - pbMessage(_INTL("{1}'s Strength made it possible to move boulders around!",pokemon.name)) + pbMessage(_INTL("{1}'s Strength made it possible to move boulders around!", pokemon.name)) $PokemonMap.strengthUsed = true next true }) - - #=============================================================================== # Surf #=============================================================================== @@ -700,16 +704,16 @@ def pbSurf return false if $game_player.pbHasDependentEvents? move = :SURF movefinder = $Trainer.get_pokemon_with_move(move) - if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF,false) || (!$DEBUG && !movefinder) + if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF, false) || (!$DEBUG && !movefinder) return false end if pbConfirmMessage(_INTL("The water is a deep blue...\nWould you like to surf on it?")) speciesname = (movefinder) ? movefinder.name : $Trainer.name - pbMessage(_INTL("{1} used {2}!",speciesname,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name)) pbCancelVehicles pbHiddenMoveAnimation(movefinder) surfbgm = GameData::Metadata.get.surf_BGM - pbCueBGM(surfbgm,0.5) if surfbgm + pbCueBGM(surfbgm, 0.5) if surfbgm pbStartSurfing return true end @@ -721,22 +725,22 @@ def pbStartSurfing $PokemonEncounters.reset_step_count $PokemonGlobal.surfing = true pbUpdateVehicle - $PokemonTemp.surfJump = $MapFactory.getFacingCoords($game_player.x,$game_player.y,$game_player.direction) + $PokemonTemp.surfJump = $MapFactory.getFacingCoords($game_player.x, $game_player.y, $game_player.direction) pbJumpToward $PokemonTemp.surfJump = nil - $game_player.check_event_trigger_here([1,2]) + $game_player.check_event_trigger_here([1, 2]) end -def pbEndSurf(_xOffset,_yOffset) +def pbEndSurf(_xOffset, _yOffset) return false if !$PokemonGlobal.surfing x = $game_player.x y = $game_player.y - if $game_map.terrain_tag(x,y).can_surf && !$game_player.pbFacingTerrainTag.can_surf - $PokemonTemp.surfJump = [x,y] - if pbJumpToward(1,false,true) + if $game_map.terrain_tag(x, y).can_surf && !$game_player.pbFacingTerrainTag.can_surf + $PokemonTemp.surfJump = [x, y] + if pbJumpToward(1, false, true) $game_map.autoplayAsCue $game_player.increase_steps - result = $game_player.check_event_trigger_here([1,2]) + result = $game_player.check_event_trigger_here([1, 2]) pbOnStepTaken(result) end $PokemonTemp.surfJump = nil @@ -745,11 +749,11 @@ def pbEndSurf(_xOffset,_yOffset) return false end -def pbTransferSurfing(mapid,xcoord,ycoord,direction=$game_player.direction) +def pbTransferSurfing(mapid, xcoord, ycoord, direction = $game_player.direction) pbFadeOutIn { - $game_temp.player_new_map_id = mapid - $game_temp.player_new_x = xcoord - $game_temp.player_new_y = ycoord + $game_temp.player_new_map_id = mapid + $game_temp.player_new_x = xcoord + $game_temp.player_new_y = ycoord $game_temp.player_new_direction = direction $scene.transfer_player(false) $game_map.autoplay @@ -757,17 +761,17 @@ def pbTransferSurfing(mapid,xcoord,ycoord,direction=$game_player.direction) } end -Events.onAction += proc { |_sender,_e| +Events.onAction += proc { |_sender, _e| next if $PokemonGlobal.surfing next if GameData::MapMetadata.exists?($game_map.map_id) && - GameData::MapMetadata.get($game_map.map_id).always_bicycle + GameData::MapMetadata.get($game_map.map_id).always_bicycle next if !$game_player.pbFacingTerrainTag.can_surf_freely - next if !$game_map.passable?($game_player.x,$game_player.y,$game_player.direction,$game_player) + next if !$game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player) pbSurf } -HiddenMoveHandlers::CanUseMove.add(:SURF,proc { |move,pkmn,showmsg| - next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF,showmsg) +HiddenMoveHandlers::CanUseMove.add(:SURF, proc { |move, pkmn, showmsg| + next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF, showmsg) if $PokemonGlobal.surfing pbMessage(_INTL("You're already surfing.")) if showmsg next false @@ -777,32 +781,30 @@ HiddenMoveHandlers::CanUseMove.add(:SURF,proc { |move,pkmn,showmsg| next false end if GameData::MapMetadata.exists?($game_map.map_id) && - GameData::MapMetadata.get($game_map.map_id).always_bicycle + GameData::MapMetadata.get($game_map.map_id).always_bicycle pbMessage(_INTL("Let's enjoy cycling!")) if showmsg next false end if !$game_player.pbFacingTerrainTag.can_surf_freely || - !$game_map.passable?($game_player.x,$game_player.y,$game_player.direction,$game_player) + !$game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player) pbMessage(_INTL("No surfing here!")) if showmsg next false end next true }) -HiddenMoveHandlers::UseMove.add(:SURF,proc { |move,pokemon| +HiddenMoveHandlers::UseMove.add(:SURF, proc { |move, pokemon| $game_temp.in_menu = false pbCancelVehicles if !pbHiddenMoveAnimation(pokemon) - pbMessage(_INTL("{1} used {2}!",pokemon.name,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", pokemon.name, GameData::Move.get(move).name)) end surfbgm = GameData::Metadata.get.surf_BGM - pbCueBGM(surfbgm,0.5) if surfbgm + pbCueBGM(surfbgm, 0.5) if surfbgm pbStartSurfing next true }) - - #=============================================================================== # Sweet Scent #=============================================================================== @@ -811,18 +813,18 @@ def pbSweetScent pbMessage(_INTL("The sweet scent faded for some reason...")) return end - viewport = Viewport.new(0,0,Graphics.width,Graphics.height) + viewport = Viewport.new(0, 0, Graphics.width, Graphics.height) viewport.z = 99999 count = 0 - viewport.color.red = 255 + viewport.color.red = 255 viewport.color.green = 0 - viewport.color.blue = 0 + viewport.color.blue = 0 viewport.color.alpha -= 10 alphaDiff = 12 * 20 / Graphics.frame_rate loop do - if count==0 && viewport.color.alpha<128 + if count == 0 && viewport.color.alpha < 128 viewport.color.alpha += alphaDiff - elsif count>Graphics.frame_rate/4 + elsif count > Graphics.frame_rate / 4 viewport.color.alpha -= alphaDiff else count += 1 @@ -830,129 +832,125 @@ def pbSweetScent Graphics.update Input.update pbUpdateSceneMap - break if viewport.color.alpha<=0 + break if viewport.color.alpha <= 0 end viewport.dispose enctype = $PokemonEncounters.encounter_type if enctype || !$PokemonEncounters.encounter_possible_here? || - !pbEncounter(enctype) + !pbEncounter(enctype) pbMessage(_INTL("There appears to be nothing here...")) end end -HiddenMoveHandlers::CanUseMove.add(:SWEETSCENT,proc { |move,pkmn,showmsg| +HiddenMoveHandlers::CanUseMove.add(:SWEETSCENT, proc { |move, pkmn, showmsg| next true }) -HiddenMoveHandlers::UseMove.add(:SWEETSCENT,proc { |move,pokemon| +HiddenMoveHandlers::UseMove.add(:SWEETSCENT, proc { |move, pokemon| if !pbHiddenMoveAnimation(pokemon) - pbMessage(_INTL("{1} used {2}!",pokemon.name,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", pokemon.name, GameData::Move.get(move).name)) end pbSweetScent next true }) - - #=============================================================================== # Teleport #=============================================================================== -HiddenMoveHandlers::CanUseMove.add(:TELEPORT,proc { |move,pkmn,showmsg| - if !GameData::MapMetadata.exists?($game_map.map_id) || - !GameData::MapMetadata.get($game_map.map_id).outdoor_map - pbMessage(_INTL("Can't use that here.")) if showmsg - next false - end - healing = $PokemonGlobal.healingSpot - healing = GameData::Metadata.get.home if !healing # Home - if !healing - pbMessage(_INTL("Can't use that here.")) if showmsg - next false - end - if $game_player.pbHasDependentEvents? - pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg - next false - end - next true -}) - -HiddenMoveHandlers::ConfirmUseMove.add(:TELEPORT,proc { |move,pkmn| - healing = $PokemonGlobal.healingSpot - healing = GameData::Metadata.get.home if !healing # Home - next false if !healing - mapname = pbGetMapNameFromId(healing[0]) - next pbConfirmMessage(_INTL("Want to return to the healing spot used last in {1}?",mapname)) -}) - -HiddenMoveHandlers::UseMove.add(:TELEPORT,proc { |move,pokemon| - healing = $PokemonGlobal.healingSpot - healing = GameData::Metadata.get.home if !healing # Home - next false if !healing - if !pbHiddenMoveAnimation(pokemon) - pbMessage(_INTL("{1} used {2}!",pokemon.name,GameData::Move.get(move).name)) - end - pbFadeOutIn { - $game_temp.player_new_map_id = healing[0] - $game_temp.player_new_x = healing[1] - $game_temp.player_new_y = healing[2] - $game_temp.player_new_direction = 2 - $scene.transfer_player - $game_map.autoplay - $game_map.refresh - } - pbEraseEscapePoint - next true -}) - - +# HiddenMoveHandlers::CanUseMove.add(:TELEPORT,proc { |move,pkmn,showmsg| +# if !GameData::MapMetadata.exists?($game_map.map_id) || +# !GameData::MapMetadata.get($game_map.map_id).outdoor_map +# pbMessage(_INTL("Can't use that here.")) if showmsg +# next false +# end +# healing = $PokemonGlobal.healingSpot +# healing = GameData::Metadata.get.home if !healing # Home +# if !healing +# pbMessage(_INTL("Can't use that here.")) if showmsg +# next false +# end +# if $game_player.pbHasDependentEvents? +# pbMessage(_INTL("It can't be used when you have someone with you.")) if showmsg +# next false +# end +# next true +# }) +# +# HiddenMoveHandlers::ConfirmUseMove.add(:TELEPORT,proc { |move,pkmn| +# healing = $PokemonGlobal.healingSpot +# healing = GameData::Metadata.get.home if !healing # Home +# next false if !healing +# mapname = pbGetMapNameFromId(healing[0]) +# next pbConfirmMessage(_INTL("Want to return to the healing spot used last in {1}?",mapname)) +# }) +# +# HiddenMoveHandlers::UseMove.add(:TELEPORT,proc { |move,pokemon| +# healing = $PokemonGlobal.healingSpot +# healing = GameData::Metadata.get.home if !healing # Home +# next false if !healing +# if !pbHiddenMoveAnimation(pokemon) +# pbMessage(_INTL("{1} used {2}!",pokemon.name,GameData::Move.get(move).name)) +# end +# pbFadeOutIn { +# $game_temp.player_new_map_id = healing[0] +# $game_temp.player_new_x = healing[1] +# $game_temp.player_new_y = healing[2] +# $game_temp.player_new_direction = 2 +# $scene.transfer_player +# $game_map.autoplay +# $game_map.refresh +# } +# pbEraseEscapePoint +# next true +# }) #=============================================================================== # Waterfall #=============================================================================== def pbAscendWaterfall - return if $game_player.direction != 8 # Can't ascend if not facing up + return if $game_player.direction != 8 # Can't ascend if not facing up terrain = $game_player.pbFacingTerrainTag return if !terrain.waterfall && !terrain.waterfall_crest - oldthrough = $game_player.through + oldthrough = $game_player.through oldmovespeed = $game_player.move_speed - $game_player.through = true + $game_player.through = true $game_player.move_speed = 2 loop do $game_player.move_up terrain = $game_player.pbTerrainTag break if !terrain.waterfall && !terrain.waterfall_crest end - $game_player.through = oldthrough + $game_player.through = oldthrough $game_player.move_speed = oldmovespeed end def pbDescendWaterfall - return if $game_player.direction != 2 # Can't descend if not facing down + return if $game_player.direction != 2 # Can't descend if not facing down terrain = $game_player.pbFacingTerrainTag return if !terrain.waterfall && !terrain.waterfall_crest - oldthrough = $game_player.through + oldthrough = $game_player.through oldmovespeed = $game_player.move_speed - $game_player.through = true + $game_player.through = true $game_player.move_speed = 2 loop do $game_player.move_down terrain = $game_player.pbTerrainTag break if !terrain.waterfall && !terrain.waterfall_crest end - $game_player.through = oldthrough + $game_player.through = oldthrough $game_player.move_speed = oldmovespeed end def pbWaterfall move = :WATERFALL movefinder = $Trainer.get_pokemon_with_move(move) - if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_WATERFALL,false) || (!$DEBUG && !movefinder) + if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_WATERFALL, false) || (!$DEBUG && !movefinder) pbMessage(_INTL("A wall of water is crashing down with a mighty roar.")) return false end if pbConfirmMessage(_INTL("It's a large waterfall. Would you like to use Waterfall?")) speciesname = (movefinder) ? movefinder.name : $Trainer.name - pbMessage(_INTL("{1} used {2}!",speciesname,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name)) pbHiddenMoveAnimation(movefinder) pbAscendWaterfall return true @@ -960,7 +958,7 @@ def pbWaterfall return false end -Events.onAction += proc { |_sender,_e| +Events.onAction += proc { |_sender, _e| terrain = $game_player.pbFacingTerrainTag if terrain.waterfall pbWaterfall @@ -969,8 +967,8 @@ Events.onAction += proc { |_sender,_e| end } -HiddenMoveHandlers::CanUseMove.add(:WATERFALL,proc { |move,pkmn,showmsg| - next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_WATERFALL,showmsg) +HiddenMoveHandlers::CanUseMove.add(:WATERFALL, proc { |move, pkmn, showmsg| + next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_WATERFALL, showmsg) if !$game_player.pbFacingTerrainTag.waterfall pbMessage(_INTL("Can't use that here.")) if showmsg next false @@ -978,9 +976,9 @@ HiddenMoveHandlers::CanUseMove.add(:WATERFALL,proc { |move,pkmn,showmsg| next true }) -HiddenMoveHandlers::UseMove.add(:WATERFALL,proc { |move,pokemon| +HiddenMoveHandlers::UseMove.add(:WATERFALL, proc { |move, pokemon| if !pbHiddenMoveAnimation(pokemon) - pbMessage(_INTL("{1} used {2}!",pokemon.name,GameData::Move.get(move).name)) + pbMessage(_INTL("{1} used {2}!", pokemon.name, GameData::Move.get(move).name)) end pbAscendWaterfall next true diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb index ca7e7e47a..9b6883942 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb @@ -37,7 +37,7 @@ class Scene_Credits # Backgrounds to show in credits. Found in Graphics/Titles/ folder BACKGROUNDS_LIST = ["credits1", "credits2", "credits3", "credits4", "credits5"] BGM = "Credits" - SCROLL_SPEED = 40 # Pixels per second + SCROLL_SPEED = 60 # Pixels per second SECONDS_PER_BACKGROUND = 11 TEXT_OUTLINE_COLOR = Color.new(0, 0, 128, 255) TEXT_BASE_COLOR = Color.new(255, 255, 255, 255) @@ -47,18 +47,142 @@ class Scene_Credits # Start Editing CREDIT = <<_END_ -Your credits go here. +Pokémon Infinite Fusion +By Chardub -Your credits go here. +General graphics / Music / Intellectual property +Nintendo +GameFreak -Your credits go here. +Programming / Eventing: +Chardub -Your credits go here. +Fused Pokemon Sprites : +Japeal - Pokefusion 2 +http://japeal.com/pkm -Your credits go here. +Special thanks to Aegide for helping to +rip the sprites and to the owners of Japeal +for accepting to share their sprites. + +Custom sprites by various +members of the Discord + +Compiler optimization +andracass (Pokémon Reborn) + +Maps: +Chardub +Some of the maps were based on work by: +BenGames, Zeak6464 + +Gameplay planning / Story: +Chardub +The story and dialogues were based +off Pokémon Red and Blue, as well as +Pokémon Gold and Silver. +Both games are made by Game Freak. + +Custom legendary Pokémon sprites: +Universez, Milchik, magnuzone, mammuth89 + +Endgame challenge teams planning: +DemICE + +Social media: +ChippyYYZ, qt314xxx, Bizmythe, Terminaut + + + +The following free ressources were also used +with their respective authors' consent: + +Pokémon Sprites: +The Smogon XY Sprite Project: +Smogon Sun/Moon Sprite Project: + +Overworld Sprites: +Rick1234, Hankiro, SailorVicious, OceansLugiaSpirit + +Battle sprites: +luckygirl88, Nalty + +Tileset graphics: +Jorginho, ThatsSoWitty DirtyWiggles + +Including tiles by the following DeviantArt users: +kyle-dove, rayd12smitty, Speedialga, +Spacemotion, Alucus ,Pokemon-Diamond, +kizemaru-kurunosuke, EpicDay, +Thurpok, UltimoSpriter, iametrine, +Minorthreat0987 , TyranitarDark, +Heavy-Metal-Lover, KKKaito, +WesleyFG, BoOmxBiG, +EternalTakai, Hek-el-grande + +Other tiles: +Chardub, chimcharsfireworkd, +Rossay, Shiney570, +Phyromatical, Gallanty + +Music: +Pokeli, TailDoll666100 +Kazune Sawatari, sentsinkantéun, +Nanashima, CharizardTheMaster, The Zame Jack + +Other graphics : +Pokemon-Diamond, WolfPP, +rekman (Pokecommunity) + +RPG Maker Scripts: +Luka S.J, shiney570, Erasus, Umbreon +FL, KleinStudio, carmaniac, Wootius, +andracass {INSERTS_PLUGIN_CREDITS_DO_NOT_REMOVE} + +Data sources: +Bulbapedia + +PBS files: +Generation 6 for Pokémon Essentials +WorldSlayer +mej71,karstictrainer, WorldSlayer, +TheDeKay, viperk1, SunakazeKun, +Radical Raptr, RPD490, +Takyon!, Pokegod7020, Drakath569, +Florio, MrDeepDarkMind, snooper117 + + +"Pokémon Essentials" was created by: +Flameguru +Poccil (Peter O.) +Maruno + +With contributions from: +AvatarMonkeyKirbyMiDas Mike +BoushyNear Fantastica +Brother1440PinkMan +FL.Popper +Genzai KawakamiRataime +HarshboySoundSpawn +help-14the__end +IceGod64Venom12 +Jacob O. WobbrockWachunga +KitsuneKoutaxLeD +Lisa Anthony +and everyone else who helped out + +"Pokémon Infinite Fusion" was made by: +Chardub + +Playtesting and Custom Sprites were made by +various members of the Discord channel. +Special thanks to all of you and to +everyone who has been involved in the +development of the game! + "Pokémon Essentials" was created by: Flameguru Poccil (Peter O.) @@ -86,17 +210,21 @@ Based on MKXP by Ancurio et al. "RPG Maker XP" by: Enterbrain +This game was inspired by the original +fusion generator: +alexonsager.alexonsager.net + +All generated fusion sprites in this game +come from the Pokémon Fusion Generator: +https://japeal.com/pkm/ + Pokémon is owned by: The Pokémon Company Nintendo Affiliated with Game Freak - - This is a non-profit fan-made game. No copyright infringements intended. -Please support the official games! - _END_ # Stop Editing diff --git a/Data/Scripts/016_UI/005_UI_Party.rb b/Data/Scripts/016_UI/005_UI_Party.rb index 744957bcc..5b4a12bc3 100644 --- a/Data/Scripts/016_UI/005_UI_Party.rb +++ b/Data/Scripts/016_UI/005_UI_Party.rb @@ -1199,7 +1199,7 @@ class PokemonPartyScreen elsif pbCanUseHiddenMove?(pkmn,pkmn.moves[i].id) if pbConfirmUseHiddenMove(pkmn,pkmn.moves[i].id) @scene.pbEndScene - if pkmn.moves[i].id == :FLY + if pkmn.moves[i].id == :FLY || pkmn.moves[i].id == :TELEPORT ret = pbBetterRegionMap(-1, true, true) if ret $PokemonTemp.flydata = ret diff --git a/Data/Scripts/016_UI/015_UI_Options.rb b/Data/Scripts/016_UI/015_UI_Options.rb index 2529e3276..9c9a6ab05 100644 --- a/Data/Scripts/016_UI/015_UI_Options.rb +++ b/Data/Scripts/016_UI/015_UI_Options.rb @@ -377,7 +377,7 @@ class PokemonOption_Scene ] if $game_switches && ($game_switches[NEW_GAME_PLUS] || $game_switches[BEAT_THE_LEAGUE]) #beat the league @PokemonOptions << - EnumOption.new(_INTL("Battle type"), [_INTL("Single"), _INTL("Double"), _INTL("Triple")], + EnumOption.new(_INTL("Battle type"), [_INTL("1v1"), _INTL("2v2"), _INTL("3v3")], proc { $PokemonSystem.textspeed }, proc { |value| if value == 0 diff --git a/Data/Scripts/049_Compatibility/PBItems.rb b/Data/Scripts/049_Compatibility/PBItems.rb index d261f1269..334c0f0f3 100644 --- a/Data/Scripts/049_Compatibility/PBItems.rb +++ b/Data/Scripts/049_Compatibility/PBItems.rb @@ -481,8 +481,11 @@ module PBItems XSPATK = 473 XSPECIAL = 473 XSPATK2 = 474 + XSPECIAL2 = 474 XSPATK3 = 475 + XSPECIAL3 = 475 XSPATK6 = 476 + XSPECIAL6 = 476 XSPDEF = 477 XSPDEF2 = 478 XSPDEF3 = 479 diff --git a/Data/Scripts/050_AddOns/BetterRegionMap.rb b/Data/Scripts/050_AddOns/BetterRegionMap.rb index d3eb34bc2..875000b71 100644 --- a/Data/Scripts/050_AddOns/BetterRegionMap.rb +++ b/Data/Scripts/050_AddOns/BetterRegionMap.rb @@ -22,7 +22,7 @@ # }) def pbBetterRegionMap(region = -1, show_player = true, can_fly = false, wallmap = false, species = nil,fly_anywhere=false) - scene = BetterRegionMap.new(region, show_player, can_fly, wallmap, species,fly_anywhere) + scene = BetterRegionMap.new(-1, show_player, can_fly, wallmap, species,fly_anywhere) return scene.flydata end @@ -52,6 +52,7 @@ class BetterRegionMap attr_reader :flydata def initialize(region = -1, show_player = true, can_fly = false, wallmap = false, species = nil,fly_anywhere=false) + region = 0 showBlk map_metadata = GameData::MapMetadata.try_get($game_map.map_id) if map_metadata diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb index 812087614..448322018 100644 --- a/Data/Scripts/050_AddOns/GeneralUtils.rb +++ b/Data/Scripts/050_AddOns/GeneralUtils.rb @@ -48,34 +48,6 @@ def pbAddPokemonID(pokemon_id, level = 1, see_form = true, skip_randomize = fals return true end -def pbGenerateEgg(pokemon, text = "") - return false if !pokemon || !$Trainer # || $Trainer.party.length>=6 - if pokemon.is_a?(String) || pokemon.is_a?(Symbol) - pokemon = getID(PBSpecies, pokemon) - end - if pokemon.is_a?(Integer) - pokemon = PokeBattle_Pokemon.new(pokemon, Settings::EGG_LEVEL, $Trainer) - end - # Get egg steps - eggsteps = $pkmn_dex[pokemon.species][10] - # Set egg's details - pokemon.name = _INTL("Egg") - pokemon.eggsteps = eggsteps - pokemon.obtainText = text - pokemon.calcStats - # Add egg to party - Kernel.pbMessage(_INTL("Received a Pokémon egg!")) - if $Trainer.party.length < 6 - $Trainer.party[$Trainer.party.length] = pokemon - else - $PokemonStorage.pbStoreCaught(pokemon) - Kernel.pbMessage(_INTL("The egg was transfered to the PC.")) - - end - #$Trainer.party[$Trainer.party.length]=pokemon - return true -end - def pbHasSpecies?(species) if species.is_a?(String) || species.is_a?(Symbol) species = getID(PBSpecies, species) diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index 61cba7ea2..a45219f5e 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 0f9b4ae5d..868d49e59 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index b145e3282..e20bb28c0 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index ad4294736..7c69aad43 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index d9bd35260..c7ea19a7a 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ diff --git a/Data/items.dat b/Data/items.dat index 7e51c9a42..53c30c495 100644 Binary files a/Data/items.dat and b/Data/items.dat differ diff --git a/Data/messages.dat b/Data/messages.dat index 03956ee77..1dae0915b 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ diff --git a/Data/trainers.dat b/Data/trainers.dat index b065a48cc..e8209f0b4 100644 Binary files a/Data/trainers.dat and b/Data/trainers.dat differ diff --git a/PBS/trainers.txt b/PBS/trainers.txt index 9034af492..ed9d50af2 100644 --- a/PBS/trainers.txt +++ b/PBS/trainers.txt @@ -1748,8 +1748,8 @@ Pokemon = B168H12,47 #ARIAFREE Pokemon = B168H220,47 #Swindos ################## -[BUGCATCHER,Nelson] -Pokemon = B141H123,51 #SCYTOPS +[BUGCATCHER,Bugsy] +Pokemon = B127H123,51 #SCYSIR ################# [BUGCATCHER,Josh]