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 a900929a9..71336e1f0 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 c0f66baff..73af1ea9e 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/Map418.rxdata b/Data/Map418.rxdata index c7d6d78d6..0bec37f50 100644 Binary files a/Data/Map418.rxdata and b/Data/Map418.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 1e2334067..c814dfae0 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/052_AddOns/New Items effects.rb b/Data/Scripts/052_AddOns/New Items effects.rb index bc9a39e10..aad72952a 100644 --- a/Data/Scripts/052_AddOns/New Items effects.rb +++ b/Data/Scripts/052_AddOns/New Items effects.rb @@ -627,7 +627,7 @@ ItemHandlers::UseOnPokemon.add(:DNAREVERSER, proc { |item, pokemon, scene| def reverseFusion(pokemon) if pokemon.owner.name == "RENTAL" - pbDisplay(_INTL("You cannot unfuse a rental pokémon!")) + pbMessage(_INTL("You cannot reverse a rental pokémon!")) return end @@ -1553,7 +1553,7 @@ def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil) return false end if pokemon.owner.name == "RENTAL" - pbDisplay(_INTL("You cannot unfuse a rental pokémon!")) + scene.pbDisplay(_INTL("You cannot unfuse a rental pokémon!")) return end 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 52dbefa72..eaaffd351 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index ef678d91b..35ca0233f 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/Game.ini b/Game.ini index 6dd6696f3..f90b658fa 100644 --- a/Game.ini +++ b/Game.ini @@ -1,5 +1,5 @@ [Game] -Library=RGSS104E.dll +Library=RGSS100J.dll Scripts=Data\Scripts.rxdata Title=infinitefusion RTP1= diff --git a/Graphics/Characters/fusion_doduo_bellsprout.png b/Graphics/Characters/fusion_doduo_bellsprout.png new file mode 100644 index 000000000..5d464dd5a Binary files /dev/null and b/Graphics/Characters/fusion_doduo_bellsprout.png differ