bugfixes 1.4

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

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

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

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

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

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:
+AvatarMonkeyKirby<s>MiDas Mike
+Boushy<s>Near Fantastica
+Brother1440<s>PinkMan
+FL.<s>Popper
+Genzai Kawakami<s>Rataime
+Harshboy<s>SoundSpawn
+help-14<s>the__end
+IceGod64<s>Venom12
+Jacob O. Wobbrock<s>Wachunga
+KitsuneKouta<s>xLeD
+Lisa Anthony<s>
+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
 

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

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

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

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

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)

PBS/trainers.txt

@@ -1748,8 +1748,8 @@ Pokemon = B168H12,47 #ARIAFREE
 Pokemon = B168H220,47 #Swindos
 ##################
 
-[BUGCATCHER,Nelson]
+[BUGCATCHER,Bugsy]
-Pokemon = B141H123,51 #SCYTOPS
+Pokemon = B127H123,51 #SCYSIR
 #################
 
 [BUGCATCHER,Josh]